From a97f2f41d324588a4d4bd698b6e98b00b7e2c529 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 17 Mar 2009 19:30:58 +0000 Subject: [PATCH] Validate argument atoms earlier for build actions. (trunk r13126) svn path=/main/branches/2.1.6/; revision=13127 --- pym/_emerge/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 50d6b7cd2..2dfafd211 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -15171,6 +15171,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, -- 2.26.2