Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r11575 - main/trunk/pym/_emerge
Date: Sat, 27 Sep 2008 22:10:32
Message-Id: E1Kjhzg-0008Lu-Ga@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-09-27 22:10:26 +0000 (Sat, 27 Sep 2008)
3 New Revision: 11575
4
5 Modified:
6 main/trunk/pym/_emerge/__init__.py
7 Log:
8 Fix code inside BlockerDB.findInstalledBlockers() to correctly strip multiple
9 "!" characters when necessary. The code seemed to work fine anyway so this is
10 more a correctness fix than a bug fix.
11
12
13 Modified: main/trunk/pym/_emerge/__init__.py
14 ===================================================================
15 --- main/trunk/pym/_emerge/__init__.py 2008-09-27 20:04:55 UTC (rev 11574)
16 +++ main/trunk/pym/_emerge/__init__.py 2008-09-27 22:10:26 UTC (rev 11575)
17 @@ -3885,8 +3885,8 @@
18 show_invalid_depstring_notice(new_pkg, depstr, atoms)
19 assert False
20
21 - blocker_atoms = [atom[1:] for atom in atoms \
22 - if atom.startswith("!")]
23 + blocker_atoms = [atom.lstrip("!") for atom in atoms \
24 + if atom[:1] == "!"]
25 if blocker_atoms:
26 blocker_atoms = InternalPackageSet(initial_atoms=blocker_atoms)
27 for inst_pkg in installed_pkgs: