diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-09-27 22:10:26 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-09-27 22:10:26 +0000 |
commit | d1a0118ecf69626dacf6d64a011dcee3b48cf808 (patch) | |
tree | b53310b7de16b217a64639efbf946542110551d1 | |
parent | 2d73b64147cc2906d06e266a5dc2bb3dae6e5560 (diff) | |
download | portage-d1a0118ecf69626dacf6d64a011dcee3b48cf808.tar.gz portage-d1a0118ecf69626dacf6d64a011dcee3b48cf808.tar.bz2 portage-d1a0118ecf69626dacf6d64a011dcee3b48cf808.zip |
Fix code inside BlockerDB.findInstalledBlockers() to correctly strip multiple
"!" characters when necessary. The code seemed to work fine anyway so this is
more a correctness fix than a bug fix.
svn path=/main/trunk/; revision=11575
-rw-r--r-- | pym/_emerge/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index eb6b855b8..519a1fdc2 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -3885,8 +3885,8 @@ class BlockerDB(object): show_invalid_depstring_notice(new_pkg, depstr, atoms) assert False - blocker_atoms = [atom[1:] for atom in atoms \ - if atom.startswith("!")] + blocker_atoms = [atom.lstrip("!") for atom in atoms \ + if atom[:1] == "!"] if blocker_atoms: blocker_atoms = InternalPackageSet(initial_atoms=blocker_atoms) for inst_pkg in installed_pkgs: |