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 e9e6e1440ead35f796ba2922af481b152f237c7d..29fdd0d3ea934a20e1e76c42fbbc29eade772e38 100755 (executable)
--- 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: