Add a new MERGE_LIST_PROGRESS color class and remove hard coded yellow/green.

svn path=/main/trunk/; revision=3743

diff --git a/bin/emerge b/bin/emerge
index 4965d5f76d2638fd6d5a95456f96efebda0e0269..e577567e87ede848192aeb6f0be63100e4da858e 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1792,7 +1792,10 @@ class depgraph:
                                pkgindex=3
                        y = self.portdb.findname(x[pkgindex])
                        if "--pretend" not in self.myopts:
-                               print "\n>>> Emerging ("+yellow(str(mergecount))+" of "+yellow(str(len(mymergelist)))+")",green(x[pkgindex]),"to",x[1]
+                               print "\n>>> Emerging (" + \
+                                       colorize("MERGE_LIST_PROGRESS", str(mergecount)) + " of " + \
+                                       colorize("MERGE_LIST_PROGRESS", str(len(mymergelist))) + ") " + \
+                                       colorize("GOOD", x[pkgindex]) + " to " + x[1]
                                emergelog(xterm_titles, " >>> emerge ("+\
                                        str(mergecount)+" of "+str(len(mymergelist))+\
                                        ") "+x[pkgindex]+" to "+x[1])

diff --git a/pym/output.py b/pym/output.py
index 87382774a1a9a5206c049e18fe469f1d7a0e492d..d41f7f20e740de5fe8b9d8a5d51d0bc86ce284cc 100644 (file)
--- a/pym/output.py
+++ b/pym/output.py
@@ -125,6 +125,7 @@ codes["BRACKET"]    = codes["blue"]
 
 # Portage functions
 codes["UNMERGE_WARN"] = codes["red"]
+codes["MERGE_LIST_PROGRESS"] = codes["yellow"]
 
 def parse_color_map():
        myfile = COLOR_MAP_FILE