diff options
| author | Ned Ludd <solar@gentoo.org> | 2007-12-25 00:24:48 +0000 |
|---|---|---|
| committer | Ned Ludd <solar@gentoo.org> | 2007-12-25 00:24:48 +0000 |
| commit | 5aa01350c28cde2daad87b59d6b8e9618bacfa11 (patch) | |
| tree | 06b2f812f3f4dc0666339ff1f03aa744e2687ed0 /pym/_emerge | |
| parent | ab6af2440278fed39db72be29de0ba100b3260f3 (diff) | |
| download | portage-5aa01350c28cde2daad87b59d6b8e9618bacfa11.tar.gz portage-5aa01350c28cde2daad87b59d6b8e9618bacfa11.tar.bz2 portage-5aa01350c28cde2daad87b59d6b8e9618bacfa11.zip | |
- small UI cleanups. *should* not cause problems with lack of missing newlines.
svn path=/main/trunk/; revision=9050
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index c905504a4..9ac218321 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5089,7 +5089,8 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval): print " "+yellow("*")+" Processed",icount,"info files;",badcount,"errors." print errmsg else: - print " "+green("*")+" Processed",icount,"info files." + if icount > 0: + print " "+green("*")+" Processed",icount,"info files." def display_news_notification(trees): @@ -5820,7 +5821,7 @@ def action_regen(settings, portdb): xterm_titles = "notitles" not in settings.features emergelog(xterm_titles, " === regen") #regenerate cache entries - print "Regenerating cache entries... " + portage.writemsg_stdout("Regenerating cache entries...\n") try: os.close(sys.stdin.fileno()) except SystemExit, e: @@ -5835,14 +5836,14 @@ def action_regen(settings, portdb): try: dead_nodes[mytree] = set(portdb.auxdb[mytree].iterkeys()) except CacheError, e: - print "\n error listing cache entries for " + \ + print "Error listing cache entries for " + \ "'%s': %s, continuing..." % (mytree, e) del e dead_nodes = None break for x in mynodes: mymatches = portdb.cp_list(x) - portage.writemsg_stdout("processing %s\n" % x) + portage.writemsg_stdout("Processing %s\n" % x) for y in mymatches: try: foo = portdb.aux_get(y,["DEPEND"]) @@ -5850,7 +5851,7 @@ def action_regen(settings, portdb): # sys.exit is an exception... And consequently, we can't catch it. raise except Exception, e: - print "\n error processing %(cpv)s, continuing... (%(e)s)" % {"cpv":y,"e":str(e)} + print "Error processing %(cpv)s, continuing... (%(e)s)" % {"cpv":y,"e":str(e)} if dead_nodes: for mytree in portdb.porttrees: if portdb.findname2(y, mytree=mytree)[0]: @@ -5863,7 +5864,7 @@ def action_regen(settings, portdb): del auxdb[y] except (KeyError, CacheError): pass - print "done!" + portage.writemsg_stdout("done!\n") def action_config(settings, trees, myopts, myfiles): if len(myfiles) != 1: |