Fix a collision with a previous variable named "p".

svn path=/main/trunk/; revision=3598

diff --git a/bin/emerge b/bin/emerge
index dc807ec1758cc6e89337fbf63cceba2dd796fb3a..cf50cc8b3484355ff4653ec1c8c65498356a89c6 100755 (executable)
--- 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