diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-22 14:08:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-22 14:08:06 +0000 |
| commit | 5cb203d7b3ffac05db6e0ad597c3fbdfc5d9211f (patch) | |
| tree | 9c06098d21a749884d356ae50e456c599df4571a /bin | |
| parent | 3209babe59edce8f808f69e26ed6135e29c8db0e (diff) | |
| download | portage-5cb203d7b3ffac05db6e0ad597c3fbdfc5d9211f.tar.gz portage-5cb203d7b3ffac05db6e0ad597c3fbdfc5d9211f.tar.bz2 portage-5cb203d7b3ffac05db6e0ad597c3fbdfc5d9211f.zip | |
Fix a collision with a previous variable named "p".
svn path=/main/trunk/; revision=3598
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index dc807ec17..cf50cc8b3 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1645,8 +1645,9 @@ class depgraph: mynewslot = self.trees["/"]["porttree"].getslot(x[2]) myoldlist = self.trees[x[1]]["vartree"].dbapi.match( portage.pkgsplit(x[2])[0]) - myinslotlist = [p for p in myoldlist if mynewslot == \ - self.trees[self.settings["ROOT"]]["vartree"].getslot(p)] + myinslotlist = [inst_pkg for inst_pkg in myoldlist + if mynewslot == self.trees[ + self.settings["ROOT"]]["vartree"].getslot(inst_pkg)] if myinslotlist: myoldbest=portage.best(myinslotlist) addl=" "+fetch |