Changeset 146

Show
Ignore:
Timestamp:
08/19/06 15:54:56 (7 years ago)
Author:
mk
Message:

Each abnormal termination of cheesecake_index should end with line starting with "Error:".

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/mk/cheesecake/cheesecake_index.py

    r145 r146  
    12781278        msg += "\nDetailed info available in log file %s" % self.logfile 
    12791279 
    1280         raise CheesecakeError(msg) 
     1280        raise CheesecakeError("Error: " + msg) 
    12811281 
    12821282    def cleanup(self, remove_log_file=True): 
    …… 
    13561356            from distutils.errors import DistutilsError 
    13571357        except ImportError, e: 
    1358             msg = "Error: setuptools is not installed and is required for downloading a package by name\n" 
     1358            msg = "setuptools is not installed and is required for downloading a package by name\n" 
    13591359            msg += "You can download and process a package by its full URL via the -u or --url option\n" 
    13601360            msg += "Example: python cheesecake.py --url=http://www.mems-exchange.org/software/durus/Durus-3.1.tar.gz" 
    …… 
    14271427        if not status: 
    14281428            drop_setuptools_info(captured_stdout, output) 
    1429             self.raise_exception("Error: setuptools returned an error: %s\n" % str(output).splitlines()[0]) 
     1429            self.raise_exception("setuptools returned an error: %s\n" % str(output).splitlines()[0]) 
    14301430 
    14311431        # If fetch returned nothing, package wasn't found. 
    14321432        if output is None: 
    14331433            drop_setuptools_info(captured_stdout) 
    1434             self.raise_exception("Error: Could not find distribution for " + self.name) 
     1434            self.raise_exception("Could not find distribution for " + self.name) 
    14351435 
    14361436        # Defaults. 

  • branches/mk/tests/unit/test_index_unpack.py

    r93 r146  
    4848            assert 0 # This statement should not be reached 
    4949        except CheesecakeError, e: 
    50             msg = "Could not unpack package %s ... exiting" % \ 
     50            msg = "Error: Could not unpack package %s ... exiting" % \ 
    5151                  os.path.join(default_temp_directory, package_file) 
    5252            msg += "\nDetailed info available in log file %s" % self.logfile 

  • branches/mk/tests/unit/test_index_url_download.py

    r93 r146  
    5959                assert 0 # This statement should not be reached 
    6060            except CheesecakeError, e: 
    61                 msg = "Got '404 Not Found' error while trying to download package ... exiting" 
     61                msg = "Error: Got '404 Not Found' error while trying to download package ... exiting" 
    6262                msg += "\nDetailed info available in log file %s" % logfile 
    6363                assert str(e) == msg