Validate argument atoms earlier for build actions. v2.2_rc26
authorZac Medico <zmedico@gentoo.org>
Tue, 17 Mar 2009 19:30:35 +0000 (19:30 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 17 Mar 2009 19:30:35 +0000 (19:30 -0000)
svn path=/main/trunk/; revision=13126

pym/_emerge/__init__.py

index 09c9ce6be2b9e07cf5780f803048a3d5e7a94ed8..6ca40e6fc6316aa36113f83dc0417c0040ce1721 100644 (file)
@@ -15662,6 +15662,18 @@ def emerge_main():
        # "update", "system", or just process files:
        else:
                validate_ebuild_environment(trees)
+
+               for x in myfiles:
+                       if x.startswith(SETPREFIX) or \
+                               is_valid_package_atom(x):
+                               continue
+                       msg = []
+                       msg.append("'%s' is not a valid package atom." % (x,))
+                       msg.append("Please check ebuild(5) for full details.")
+                       writemsg_level("".join("!!! %s\n" % line for line in msg),
+                               level=logging.ERROR, noiselevel=-1)
+                       return 1
+
                if "--pretend" not in myopts:
                        display_news_notification(root_config, myopts)
                retval = action_build(settings, trees, mtimedb,