diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-03 22:40:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-03 22:40:56 +0000 |
| commit | 4b28146f1d0bbe35009879955b79d2d2d1900789 (patch) | |
| tree | 18eda087420fe5875029253f5aaef546958e0a0f | |
| parent | 58e4568b10011a5b8dcceff0221bd0cb18c0981a (diff) | |
| download | portage-4b28146f1d0bbe35009879955b79d2d2d1900789.tar.gz portage-4b28146f1d0bbe35009879955b79d2d2d1900789.tar.bz2 portage-4b28146f1d0bbe35009879955b79d2d2d1900789.zip | |
Eliminate a redundant atom from the --update greedy slot expansion code.
svn path=/main/trunk/; revision=9695
| -rw-r--r-- | pym/_emerge/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 8b6ee4add..117bc448b 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -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 |