summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-30 06:06:07 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-30 06:06:07 -0700
commitdabc8d96bfe1cf25b29ad82f9b9dda47e29187e2 (patch)
treebd24dcad551d64ccdae2c69dd19bf93e81123f73
parentc1dcd47214ca7935a30355586d4277b73cdf71b9 (diff)
downloadportage-dabc8d96bfe1cf25b29ad82f9b9dda47e29187e2.tar.gz
portage-dabc8d96bfe1cf25b29ad82f9b9dda47e29187e2.tar.bz2
portage-dabc8d96bfe1cf25b29ad82f9b9dda47e29187e2.zip
Make match_from_list() strip "!!" when appropriate for strong blocks.
-rw-r--r--pym/portage/dep/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 382a4f611..8e2b2ef49 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -1646,7 +1646,10 @@ def match_from_list(mydep, candidate_list):
from portage.util import writemsg
if "!" == mydep[:1]:
- mydep = mydep[1:]
+ if "!" == mydep[1:2]:
+ mydep = mydep[2:]
+ else:
+ mydep = mydep[1:]
if not isinstance(mydep, Atom):
mydep = Atom(mydep, allow_wildcard=True)