diff options
| author | Marius Mauch <genone@gentoo.org> | 2007-06-23 19:12:36 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2007-06-23 19:12:36 +0000 |
| commit | a5d3b660fd70164597a25a9ebc90b3faa00f1fb5 (patch) | |
| tree | 8ad23f52d704187ad8218af2313df165cb401b6b | |
| parent | 8d92c6f70268c56e3351d01cd9fd2351e27d0bc9 (diff) | |
| download | portage-a5d3b660fd70164597a25a9ebc90b3faa00f1fb5.tar.gz portage-a5d3b660fd70164597a25a9ebc90b3faa00f1fb5.tar.bz2 portage-a5d3b660fd70164597a25a9ebc90b3faa00f1fb5.zip | |
highlight world packages in --pretend output (bug #142473)
svn path=/main/trunk/; revision=6979
| -rw-r--r-- | pym/emerge/__init__.py | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index c086c7901..c9e2e6e54 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2478,6 +2478,8 @@ class depgraph(object): # files to fetch list - avoids counting a same file twice # in size display (verbose mode) myfetchlist=[] + worldlist = getlist(self.settings, "world") + for mylist_index in xrange(len(mylist)): x, depth, ordered = mylist[mylist_index] pkg_type = x[0] @@ -2746,17 +2748,23 @@ class depgraph(object): myoldbest=myoldbest[:-3] myoldbest=blue("["+myoldbest+"]") + if xs[0] in worldlist: + pkgprint = bold + else: + def pkgprint(pkg): + return pkg + if x[1]!="/": if myoldbest: myoldbest +=" " if "--columns" in self.myopts: if "--quiet" in self.myopts: - myprint=addl+" "+indent+darkgreen(xs[0]) + myprint=addl+" "+indent+darkgreen(pkgprint(xs[0])) myprint=myprint+darkblue(" "+xs[1]+xs[2])+" " myprint=myprint+myoldbest myprint=myprint+darkgreen("to "+x[1]) else: - myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0]) + myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(pkgprint(xs[0])) if (newlp-nc_len(myprint)) > 0: myprint=myprint+(" "*(newlp-nc_len(myprint))) myprint=myprint+"["+darkblue(xs[1]+xs[2])+"] " @@ -2769,17 +2777,17 @@ class depgraph(object): myprint = darkblue("[nomerge ] ") else: myprint = "[" + pkg_type + " " + addl + "] " - myprint += indent + darkgreen(pkg_key) + " " + \ + myprint += indent + darkgreen(pkrprint(pkg_key)) + " " + \ myoldbest + darkgreen("to " + myroot) + " " + \ verboseadd else: if "--columns" in self.myopts: if "--quiet" in self.myopts: - myprint=addl+" "+indent+darkgreen(xs[0]) + myprint=addl+" "+indent+darkgreen(pkgprint(xs[0])) myprint=myprint+" "+green(xs[1]+xs[2])+" " myprint=myprint+myoldbest else: - myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0]) + myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(pkgprint(xs[0])) if (newlp-nc_len(myprint)) > 0: myprint=myprint+(" "*(newlp-nc_len(myprint))) myprint=myprint+green(" ["+xs[1]+xs[2]+"] ") @@ -2788,9 +2796,9 @@ class depgraph(object): myprint=myprint+myoldbest+" "+verboseadd else: if x[-1] == "nomerge" or not ordered: - myprint=darkblue("[nomerge ] "+indent+x[2]+" "+myoldbest+" ")+verboseadd + myprint=darkblue("[nomerge ] "+indent+pkgprint(x[2])+" "+myoldbest+" ")+verboseadd else: - myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(x[2])+" "+myoldbest+" "+verboseadd + myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(pkgprint(x[2]))+" "+myoldbest+" "+verboseadd p.append(myprint) mysplit = portage.pkgsplit(x[2]) |