Make dep_check validate all depstring atoms in order to prevent problems from occurin...

svn path=/main/trunk/; revision=5304

diff --git a/bin/emerge b/bin/emerge
index d5e136feb5bf014005b2aeb55fe7dce4d41cc22a..771e61a99e941a98981d9e967ab644361ff04456 100755 (executable)
--- 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 22e6455d6caa6ef4928c1441a45417730cdfeca6..0f1ba998f98f219b47e0c6222161544e2fec376c 100644 (file)
--- 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)