Support subslots in command line arguments.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 3cd44dd4e930f2252474e4dd56ed746addc91e95..fab87d946aadc5c29bf86187a7b0196d3b523a40 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2405,7 +2405,7 @@ class depgraph(object):
                                #      came from, if any.
                                #   2) It takes away freedom from the resolver to choose other
                                #      possible expansions when necessary.
-                               if "/" in x:
+                               if "/" in x.split(":")[0]:
                                        args.append(AtomArg(arg=x, atom=Atom(x, allow_repo=True),
                                                root_config=root_config))
                                        continue

diff --git a/pym/_emerge/is_valid_package_atom.py b/pym/_emerge/is_valid_package_atom.py
index a1e429414e730f0ed71779f60d6c7b1cbe254fa7..c4f6ffdf34e53f030521beb1cbe92a9bc6e891e7 100644 (file)
--- a/pym/_emerge/is_valid_package_atom.py
+++ b/pym/_emerge/is_valid_package_atom.py
@@ -14,7 +14,7 @@ def insert_category_into_atom(atom, category):
        return ret
 
 def is_valid_package_atom(x, allow_repo=False):
-       if "/" not in x:
+       if "/" not in x.split(":")[0]:
                x2 = insert_category_into_atom(x, 'cat')
                if x2 != None:
                        x = x2

diff --git a/pym/portage/dbapi/dep_expand.py b/pym/portage/dbapi/dep_expand.py
index ac8ccf4b32c6cf9923b5cec700086bd6f6eaa26c..bb211c739682aafddb5345a29430c5f6cc25c9a7 100644 (file)
--- a/pym/portage/dbapi/dep_expand.py
+++ b/pym/portage/dbapi/dep_expand.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Gentoo Foundation
+# Copyright 2010-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = ["dep_expand"]
@@ -23,7 +23,7 @@ def dep_expand(mydep, mydb=None, use_cache=1, settings=None):
                if mydep[0] == "*":
                        mydep = mydep[1:]
                        orig_dep = mydep
-               has_cat = '/' in orig_dep
+               has_cat = '/' in orig_dep.split(':')[0]
                if not has_cat:
                        alphanum = re.search(r'\w', orig_dep)
                        if alphanum: