- small UI cleanups. *should* not cause problems with lack

of missing newlines. (trunk r9050)

svn path=/main/branches/2.1.2/; revision=9067

2 files changed, 10 insertions, 9 deletions

diff --git a/bin/emerge b/bin/emerge
index 5725d8152..3febb47ff 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4721,7 +4721,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 post_emerge(settings, mtimedb, retval):
@@ -5363,7 +5364,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:
@@ -5378,14 +5379,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"])
@@ -5393,7 +5394,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]:
@@ -5406,7 +5407,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 or "system" in myfiles or "world" in myfiles:
diff --git a/pym/portage.py b/pym/portage.py
index 835440c6a..ddf0bff69 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7717,11 +7717,11 @@ class binarytree(object):
 			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 = getbinpkg.dir_get_metadata(
 				self.settings["PORTAGE_BINHOST"], chunk_size=chunk_size)
-			writemsg_stdout(green("  -- DONE!\n\n"))
+			#writemsg_stdout(green("  -- DONE!\n\n"))
 
 			for mypkg in self.remotepkgs.keys():
 				if not self.remotepkgs[mypkg].has_key("CATEGORY"):