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

Rename variable pkg_cpv to pkg_str.

svn path=/main/trunk/; revision=9821
---

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: