From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 10 Apr 2008 21:08:42 +0000 (-0000)
Subject: Rename variable pkg_cpv to pkg_str. (trunk r9821)
X-Git-Tag: v2.1.5~201
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bc917674e146aa632b3f634bda51024a33c8c5e5;p=portage.git

Rename variable pkg_cpv to pkg_str. (trunk r9821)

svn path=/main/branches/2.1.2/; revision=9822
---

diff --git a/bin/emerge b/bin/emerge
index e9e6e1440..29fdd0d3e 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4232,21 +4232,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: