diff options
| author | dol-sen <brian.dolbec@gmail.com> | 2011-08-07 00:05:33 -0700 |
|---|---|---|
| committer | dol-sen <brian.dolbec@gmail.com> | 2011-08-07 00:05:33 -0700 |
| commit | 8f850f20af9c1b6360500b36ffada70e07ce45e9 (patch) | |
| tree | d836609c18d6aa4210f87f42d46d33e3486819ef /layman | |
| parent | 009d0632ae496197807d520df380017dca664543 (diff) | |
| download | layman-8f850f20af9c1b6360500b36ffada70e07ce45e9.tar.gz layman-8f850f20af9c1b6360500b36ffada70e07ce45e9.tar.bz2 layman-8f850f20af9c1b6360500b36ffada70e07ce45e9.zip | |
tidy up some task spacing, eliminate a duped error output, comment out some debug output.
Diffstat (limited to 'layman')
| -rwxr-xr-x | layman/api.py | 6 | ||||
| -rw-r--r-- | layman/cli.py | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/layman/api.py b/layman/api.py index c04dfe6..e85f5ee 100755 --- a/layman/api.py +++ b/layman/api.py @@ -309,12 +309,12 @@ class LaymanAPI(object): for ovl in repos: self.output.debug("API.sync(); starting ovl = %s" %ovl, 5) try: - self.output.debug("API.sync(); selecting %s, db = %s" % (ovl, str(db)), 5) + #self.output.debug("API.sync(); selecting %s, db = %s" % (ovl, str(db)), 5) odb = db.select(ovl) self.output.debug("API.sync(); %s now selected" %ovl, 5) except UnknownOverlayException as error: - self.output.debug("API.sync(); UnknownOverlayException selecting %s" %ovl, 5) - self._error(str(error)) + #self.output.debug("API.sync(); UnknownOverlayException selecting %s" %ovl, 5) + #self._error(str(error)) fatals.append((ovl, 'Failed to select overlay "' + ovl + '".\nError was: ' + str(error))) diff --git a/layman/cli.py b/layman/cli.py index 5c1b0a6..396cadc 100644 --- a/layman/cli.py +++ b/layman/cli.py @@ -150,6 +150,8 @@ class Main(object): def __call__(self): self.output.debug("CLI.__call__(): self.config.keys()" " %s" % str(self.config.keys()), 6) + # blank newline -- no " *" + self.output.notice('') # Make fetching the overlay list a default action if not 'nofetch' in self.config.keys(): # Actions that implicitely call the fetch operation before @@ -196,11 +198,11 @@ class Main(object): self.output.debug('Checking for action errors', 4) if action_errors: for action, _errors in action_errors: - self.output.notice("\n") self.output.warn("CLI: Errors occured processing action" " %s" % action) for _error in _errors: self.output.error(_error) + self.output.notice("") # Reset umask os.umask(old_umask) @@ -214,7 +216,7 @@ class Main(object): def Fetch(self): ''' Fetches the overlay listing. ''' - self.output.info("\nFetching remote list,...", 2) + self.output.info("Fetching remote list,...", 2) result = self.api.fetch_remote_list() if result: self.output.info('Fetch Ok', 2) @@ -226,7 +228,7 @@ class Main(object): def Add(self): ''' Adds the selected overlays. ''' - self.output.info("\nAdding overlay,...", 2) + self.output.info("Adding overlay,...", 2) selection = decode_selection(self.config['add']) if 'ALL' in selection: selection = self.api.get_available() @@ -244,7 +246,7 @@ class Main(object): def Sync(self): ''' Syncs the selected overlays. ''' - self.output.info("\nSyncing selected overlays,...", 2) + self.output.info("Syncing selected overlays,...", 2) # Note api.sync() defaults to printing results selection = decode_selection(self.config['sync']) if self.config['sync_all'] or 'ALL' in selection: @@ -259,7 +261,7 @@ class Main(object): def Delete(self): ''' Deletes the selected overlays. ''' - self.output.info('\nDeleting selected overlays,...', 2) + self.output.info('Deleting selected overlays,...', 2) selection = decode_selection(self.config['delete']) if 'ALL' in selection: selection = self.api.get_installed() |