summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 768da9b14..2bcbd4e07 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5416,10 +5416,15 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
newsplit.append(_expand_new_virtuals(x, edebug, mydbapi,
mysettings, myroot=myroot, trees=trees, **kwargs))
continue
- if portage_dep._dep_check_strict and \
- not isvalidatom(x, allow_blockers=True):
- raise portage_exception.ParseError(
- "invalid atom: '%s'" % x)
+
+ if not isinstance(x, portage_dep.Atom):
+ try:
+ x = portage_dep.Atom(x)
+ except portage_exception.InvalidAtom:
+ if portage_dep._dep_check_strict:
+ raise portage_exception.ParseError(
+ "invalid atom: '%s'" % x)
+
mykey = dep_getkey(x)
if not mykey.startswith("virtual/"):
newsplit.append(x)