From 5cb203d7b3ffac05db6e0ad597c3fbdfc5d9211f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 22 Jun 2006 14:08:06 +0000 Subject: Fix a collision with a previous variable named "p". svn path=/main/trunk/; revision=3598 --- bin/emerge | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bin') 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 -- cgit v1.2.3-1-g7c22