summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/emerge1
-rw-r--r--pym/portage.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge
index d5e136feb..771e61a99 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1328,6 +1328,7 @@ class depgraph:
if not mycheck[0]:
sys.stderr.write("\n\n%s\n\n" % mycheck[1])
+ sys.stderr.write("Parent: %s\n\n" % str(myparent))
sys.stderr.write("%s\n\n" % depstring)
return 0
mymerge = mycheck[1]
diff --git a/pym/portage.py b/pym/portage.py
index 22e6455d6..0f1ba998f 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3647,6 +3647,9 @@ 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 not isvalidatom(x, allow_blockers=True):
+ raise portage_exception.ParseError(
+ "invalid atom: '%s'" % x)
mykey = dep_getkey(x)
if not mykey.startswith("virtual/"):
newsplit.append(x)