summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/__init__.py13
-rw-r--r--pym/portage/dbapi/bintree.py6
2 files changed, 10 insertions, 9 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:
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 5464d5d98..48e38beb4 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -639,11 +639,11 @@ class binarytree(object):
chunk_size = 8
except (ValueError, KeyError):
chunk_size = 3000
- writemsg_stdout("\n\n")
- writemsg_stdout(green("Fetching binary packages info...\n"))
+ writemsg_stdout("\n")
+ writemsg_stdout(green("Fetching bininfo from ")+base_url+"\n")
self.remotepkgs = portage.getbinpkg.dir_get_metadata(
self.settings["PORTAGE_BINHOST"], chunk_size=chunk_size)
- writemsg(green(" -- DONE!\n\n"))
+ #writemsg(green(" -- DONE!\n\n"))
for mypkg in self.remotepkgs.keys():
if not self.remotepkgs[mypkg].has_key("CATEGORY"):