From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 2 May 2008 03:24:05 +0000 (-0000)
Subject: Fix broken variable references found by pyflakes. (trunk r10072)
X-Git-Tag: v2.1.5~101
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=28e90fa805ba9472131817eec2e2c50b834d0fce;p=portage.git

Fix broken variable references found by pyflakes. (trunk r10072)

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

diff --git a/bin/emerge b/bin/emerge
index eb9452d0e..e1342d4de 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3329,7 +3329,7 @@ class depgraph(object):
 						blockers is not None:
 						# Re-use the blockers from the graph.
 						blocker_atoms = sorted(blockers)
-						counter = long(node.metadata["COUNTER"])
+						counter = long(pkg.metadata["COUNTER"])
 						blocker_data = \
 							blocker_cache.BlockerData(counter, blocker_atoms)
 						blocker_cache[pkg.cpv] = blocker_data
@@ -4355,9 +4355,7 @@ class depgraph(object):
 							counters.newslot += 1
 
 					if "--changelog" in self.myopts:
-						slot_atom = "%s:%s" % (portage.dep_getkey(pkg_key),
-							mydbapi.aux_get(pkg_key, ["SLOT"])[0])
-						inst_matches = vardb.match(slot_atom)
+						inst_matches = vardb.match(pkg.slot_atom)
 						if inst_matches:
 							changelogs.extend(self.calc_changelog(
 								portdb.findname(pkg_key),