[gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/_emerge/

["Arfrever Frehtes Taifersar Arahesis" <arfrever.fta@gmail.com>]

commit:     b4440ce6a87d7c6932132185697dd3c4888d752c
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun Dec 23 05:32:24 2012 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Sun Dec 23 05:32:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b4440ce6

Support subslots in command line arguments.

---
 pym/_emerge/depgraph.py              |    2 +-
 pym/_emerge/is_valid_package_atom.py |    2 +-
 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 3cd44dd..fab87d9 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 a1e4294..c4f6ffd 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 ac8ccf4..bb211c7 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: