summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-17 19:30:35 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-17 19:30:35 +0000
commit2a3f745621a0826a8561bfce70fd6d3fedd4d78f (patch)
treed2693dfa4baa00432b56a61e1076b26cb3fa8a9c
parent05ca3d7eaa9dd4f2c242c33d8088eaadf4e67665 (diff)
downloadportage-2a3f745621a0826a8561bfce70fd6d3fedd4d78f.tar.gz
portage-2a3f745621a0826a8561bfce70fd6d3fedd4d78f.tar.bz2
portage-2a3f745621a0826a8561bfce70fd6d3fedd4d78f.zip
Validate argument atoms earlier for build actions.v2.2_rc26
svn path=/main/trunk/; revision=13126
-rw-r--r--pym/_emerge/__init__.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 09c9ce6be..6ca40e6fc 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -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,