diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-01-13 08:54:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-01-13 08:54:35 +0000 |
| commit | df6bb77f8e66cd1ead7f9f27583ff4e7cae60c85 (patch) | |
| tree | 5f81e335a1a69d38314b31f5451addd4fe53a505 /bin/emerge | |
| parent | 4c43a6bef9e62967b3d880914ce42280831520ff (diff) | |
| download | portage-df6bb77f8e66cd1ead7f9f27583ff4e7cae60c85.tar.gz portage-df6bb77f8e66cd1ead7f9f27583ff4e7cae60c85.tar.bz2 portage-df6bb77f8e66cd1ead7f9f27583ff4e7cae60c85.zip | |
Catch InvalidData exceptions for bad atoms passed as emerge arguments.
svn path=/main/trunk/; revision=5629
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 4 insertions, 1 deletions
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: |