Fix broken variable references found by pyflakes.
authorZac Medico <zmedico@gentoo.org>
Fri, 2 May 2008 03:23:36 +0000 (03:23 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 2 May 2008 03:23:36 +0000 (03:23 -0000)
svn path=/main/trunk/; revision=10072

pym/_emerge/__init__.py

index 3f3d2a2a3d00eb08dd8fe4b1b8f5287a49f91563..d2068f1ae2439f522c4916ffadfab466446360bc 100644 (file)
@@ -3182,7 +3182,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
@@ -4208,9 +4208,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),