diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-12-23 06:32:24 +0100 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-12-23 06:32:24 +0100 |
| commit | b4440ce6a87d7c6932132185697dd3c4888d752c (patch) | |
| tree | 5dec2ced04316fe22b8949cca70168b01546316a | |
| parent | 8e8d1789b96f668d1738d6444e86529ade63dc10 (diff) | |
| download | portage-b4440ce6a87d7c6932132185697dd3c4888d752c.tar.gz portage-b4440ce6a87d7c6932132185697dd3c4888d752c.tar.bz2 portage-b4440ce6a87d7c6932132185697dd3c4888d752c.zip | |
Support subslots in command line arguments.
| -rw-r--r-- | pym/_emerge/depgraph.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/is_valid_package_atom.py | 2 | ||||
| -rw-r--r-- | pym/portage/dbapi/dep_expand.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 3cd44dd4e..fab87d946 100644 --- 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 a1e429414..c4f6ffdf3 100644 --- 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 ac8ccf4b3..bb211c739 100644 --- 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: |