Eliminate a redundant atom from the --update greedy slot expansion code.
authorZac Medico <zmedico@gentoo.org>
Thu, 3 Apr 2008 22:40:56 +0000 (22:40 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 3 Apr 2008 22:40:56 +0000 (22:40 -0000)
svn path=/main/trunk/; revision=9695

pym/_emerge/__init__.py

index 8b6ee4add5dbd61f1410ca00e288e4be50e458c1..117bc448bd727284708133038836492af8e30ef8 100644 (file)
@@ -1990,9 +1990,6 @@ class depgraph(object):
                        myslots.add(vardb.aux_get(cpv, ["SLOT"])[0])
                for myslot in myslots:
                        yield "%s:%s" % (mykey, myslot)
-               # In addition to any installed slots, also try to pull
-               # in the latest new slot that may be available.
-               yield atom
 
        def _iter_args_for_pkg(self, pkg):
                # TODO: add multiple $ROOT support
@@ -2221,6 +2218,8 @@ class depgraph(object):
                        # atoms could be a property of the set itself.
                        greedy_atoms = []
                        for arg in args:
+                               # In addition to any installed slots, also try to pull
+                               # in the latest new slot that may be available.
                                greedy_atoms.append(arg)
                                if not isinstance(arg, (AtomArg, PackageArg)):
                                        continue