| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-02 03:24:05 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10074 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix broken variable references found by pyflakes. (trunk r10072) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/bin/emerge |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/bin/emerge 2008-05-02 03:23:38 UTC (rev 10073) |
| 14 |
+++ main/branches/2.1.2/bin/emerge 2008-05-02 03:24:05 UTC (rev 10074) |
| 15 |
@@ -3329,7 +3329,7 @@ |
| 16 |
blockers is not None: |
| 17 |
# Re-use the blockers from the graph. |
| 18 |
blocker_atoms = sorted(blockers) |
| 19 |
- counter = long(node.metadata["COUNTER"]) |
| 20 |
+ counter = long(pkg.metadata["COUNTER"]) |
| 21 |
blocker_data = \ |
| 22 |
blocker_cache.BlockerData(counter, blocker_atoms) |
| 23 |
blocker_cache[pkg.cpv] = blocker_data |
| 24 |
@@ -4355,9 +4355,7 @@ |
| 25 |
counters.newslot += 1 |
| 26 |
|
| 27 |
if "--changelog" in self.myopts: |
| 28 |
- slot_atom = "%s:%s" % (portage.dep_getkey(pkg_key), |
| 29 |
- mydbapi.aux_get(pkg_key, ["SLOT"])[0]) |
| 30 |
- inst_matches = vardb.match(slot_atom) |
| 31 |
+ inst_matches = vardb.match(pkg.slot_atom) |
| 32 |
if inst_matches: |
| 33 |
changelogs.extend(self.calc_changelog( |
| 34 |
portdb.findname(pkg_key), |
| 35 |
|
| 36 |
-- |
| 37 |
gentoo-commits@l.g.o mailing list |
Archives