diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-07 08:15:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-07 08:15:49 +0000 |
| commit | e080043cdbadd2d386baf72f6543ca8d4856227d (patch) | |
| tree | 8f0421adab606ca155cb76a60f60a44a616454a5 | |
| parent | 8d246d5a9a862ee87127638b234f7641b3e785f4 (diff) | |
| download | portage-e080043cdbadd2d386baf72f6543ca8d4856227d.tar.gz portage-e080043cdbadd2d386baf72f6543ca8d4856227d.tar.bz2 portage-e080043cdbadd2d386baf72f6543ca8d4856227d.zip | |
Fix broken logic for --update greedy slot atoms in
depgraph.select_files().
svn path=/main/trunk/; revision=8452
| -rw-r--r-- | pym/_emerge/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 66af63957..7cf132cd4 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1819,12 +1819,14 @@ class depgraph(object): print return False, myfavorites - if "--update" in self.myopts and not mysets: + if "--update" in self.myopts: # Enable greedy SLOT atoms for atoms given as arguments. # This is currently disabled for sets since greedy SLOT # atoms could be a property of the set itself. greedy_atoms = [] for myarg, atom in arg_atoms: + if myarg.startswith(SETPREFIX): + continue greedy_atoms.append((myarg, atom)) for greedy_atom in self._greedy_slot_atoms(myroot, atom): greedy_atoms.append((myarg, greedy_atom)) |