From df6bb77f8e66cd1ead7f9f27583ff4e7cae60c85 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 13 Jan 2007 08:54:35 +0000 Subject: [PATCH] Catch InvalidData exceptions for bad atoms passed as emerge arguments. svn path=/main/trunk/; revision=5629 --- bin/emerge | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/emerge b/bin/emerge index e73e5e40c..317ae4ef9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3578,7 +3578,10 @@ def chk_updated_cfg_files(target_root, config_protect): print def is_valid_package_atom(x): - testkey = portage.dep_getkey(x) + try: + testkey = portage.dep_getkey(x) + except portage_exception.InvalidData: + return False if testkey.startswith("null/"): testatom = x.replace(testkey[5:], "cat/"+testkey[5:]) elif "/" not in x: -- 2.26.2