summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-06-28 01:22:19 +0000
committerZac Medico <zmedico@gentoo.org>2007-06-28 01:22:19 +0000
commit4b3390fd0b42eda22d798488c175db1c94be634e (patch)
treebe57f591916b81b4452fbdba4fb8732c00a7f7d7
parent6363c6390dc78da1a451e1e3c05a4f10cf63c4a7 (diff)
downloadportage-4b3390fd0b42eda22d798488c175db1c94be634e.tar.gz
portage-4b3390fd0b42eda22d798488c175db1c94be634e.tar.bz2
portage-4b3390fd0b42eda22d798488c175db1c94be634e.zip
Just use a containment test for matching pprovided args since it works correctly and match_to_list() isn't appropriate for this.
svn path=/main/trunk/; revision=7065
-rw-r--r--pym/emerge/__init__.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 06225c1c4..fd6643dea 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1560,10 +1560,8 @@ class depgraph(object):
if not mymerge and arg:
# A provided package has been specified on the command line. The
# package will not be merged and a warning will be displayed.
-
cp = portage.dep_getkey(depstring)
- if cp in self._args_atoms and \
- portage.match_to_list(depstring, self._args_atoms[cp]):
+ if cp in self._args_atoms and depstring in self._args_atoms[cp]:
self._pprovided_args.append(arg)
if myparent: