summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-10 21:08:11 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-10 21:08:11 +0000
commit181ac87a4f0717d5a4d2ef93cf4a1727e45ead93 (patch)
treeec1e3e0f0bd4f5abfecfe49941993031e42ae0eb
parentbcf994268c52e32032805ea54cd244a0e0607941 (diff)
downloadportage-181ac87a4f0717d5a4d2ef93cf4a1727e45ead93.tar.gz
portage-181ac87a4f0717d5a4d2ef93cf4a1727e45ead93.tar.bz2
portage-181ac87a4f0717d5a4d2ef93cf4a1727e45ead93.zip
Rename variable pkg_cpv to pkg_str.
svn path=/main/trunk/; revision=9821
-rw-r--r--pym/_emerge/__init__.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index f84d3e3df..7586efb4d 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4079,21 +4079,21 @@ class depgraph(object):
# This is reported elsewhere if relevant.
pass
- def pkgprint(pkg_cpv):
+ def pkgprint(pkg_str):
if pkg_merge:
if pkg_system:
- return colorize("PKG_MERGE_SYSTEM", pkg_cpv)
+ return colorize("PKG_MERGE_SYSTEM", pkg_str)
elif pkg_world:
- return colorize("PKG_MERGE_WORLD", pkg_cpv)
+ return colorize("PKG_MERGE_WORLD", pkg_str)
else:
- return colorize("PKG_MERGE", pkg_cpv)
+ return colorize("PKG_MERGE", pkg_str)
else:
if pkg_system:
- return colorize("PKG_NOMERGE_SYSTEM", pkg_cpv)
+ return colorize("PKG_NOMERGE_SYSTEM", pkg_str)
elif pkg_world:
- return colorize("PKG_NOMERGE_WORLD", pkg_cpv)
+ return colorize("PKG_NOMERGE_WORLD", pkg_str)
else:
- return colorize("PKG_NOMERGE", pkg_cpv)
+ return colorize("PKG_NOMERGE", pkg_str)
if x[1]!="/":
if myoldbest: