[gentoo-commits] portage r9820 - main/branches/2.1.2/bin

[gentoo-commits] portage r9820 - main/branches/2.1.2/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-04-10 21:04:58 +0000 (Thu, 10 Apr 2008)
New Revision: 9820

Modified:
   main/branches/2.1.2/bin/emerge
Log:
Fix "pkg" variable name collisions in depgraph.display(). (trunk r9819)


Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge	2008-04-10 21:03:37 UTC (rev 9819)
+++ main/branches/2.1.2/bin/emerge	2008-04-10 21:04:58 UTC (rev 9820)
@@ -4033,13 +4033,12 @@
 					cur_use = [flag for flag in cur_use if flag in cur_iuse]
 
 					if myoldbest and myinslotlist:
-						pkg = myoldbest[0]
+						previous_cpv = myoldbest[0]
 					else:
-						pkg = x[2]
-					if self.trees[x[1]]["vartree"].dbapi.cpv_exists(pkg):
-						old_iuse, old_use = \
-							self.trees[x[1]]["vartree"].dbapi.aux_get(
-								pkg, ["IUSE", "USE"])
+						previous_cpv = pkg.cpv
+					if vardb.cpv_exists(previous_cpv):
+						old_iuse, old_use = vardb.aux_get(
+								previous_cpv, ["IUSE", "USE"])
 						old_iuse = list(set(
 							filter_iuse_defaults(old_iuse.split())))
 						old_iuse.sort()
@@ -4233,21 +4232,21 @@
 					# This is reported elsewhere if relevant.
 					pass
 
-				def pkgprint(pkg):
+				def pkgprint(pkg_cpv):
 					if pkg_merge:
 						if pkg_system:
-							return colorize("PKG_MERGE_SYSTEM", pkg)
+							return colorize("PKG_MERGE_SYSTEM", pkg_cpv)
 						elif pkg_world:
-							return colorize("PKG_MERGE_WORLD", pkg)
+							return colorize("PKG_MERGE_WORLD", pkg_cpv)
 						else:
-							return colorize("PKG_MERGE", pkg)
+							return colorize("PKG_MERGE", pkg_cpv)
 					else:
 						if pkg_system:
-							return colorize("PKG_NOMERGE_SYSTEM", pkg)
+							return colorize("PKG_NOMERGE_SYSTEM", pkg_cpv)
 						elif pkg_world:
-							return colorize("PKG_NOMERGE_WORLD", pkg)
+							return colorize("PKG_NOMERGE_WORLD", pkg_cpv)
 						else:
-							return colorize("PKG_NOMERGE", pkg)
+							return colorize("PKG_NOMERGE", pkg_cpv)
 
 				if x[1]!="/":
 					if myoldbest:

-- 
gentoo-commits@lists.gentoo.org mailing list