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 f84d3e3dfb2ad72b02a202930c203c427487a8e5..7586efb4d16d6e56fafb4487ea10658cd872caa1 100644 (file)
--- 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: