diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-01 18:05:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-01 18:05:55 +0000 |
| commit | 3ad69facf2b5e561d2fc6753f66164706fca32fc (patch) | |
| tree | d4c1d27c4d74a4419efa4654b3aa2a29c49aa1b3 | |
| parent | a727207ba2371c5a88aa99c5ded300068fff61e0 (diff) | |
| download | portage-3ad69facf2b5e561d2fc6753f66164706fca32fc.tar.gz portage-3ad69facf2b5e561d2fc6753f66164706fca32fc.tar.bz2 portage-3ad69facf2b5e561d2fc6753f66164706fca32fc.zip | |
Add a new MERGE_LIST_PROGRESS color class and remove hard coded yellow/green.
svn path=/main/trunk/; revision=3743
| -rwxr-xr-x | bin/emerge | 5 | ||||
| -rw-r--r-- | pym/output.py | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 4965d5f76..e577567e8 100755 --- 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 87382774a..d41f7f20e 100644 --- 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 |