diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-03-17 19:13:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-17 19:13:33 +0000 |
| commit | 5be0ffa71ad974963f29ed21080362835f49c31c (patch) | |
| tree | 7549a536201f76162955cf9015f64e0682eaf925 | |
| parent | Do not create hardlinks when merging CONFIG_PROTECTed files since config (diff) | |
| download | portage-multirepo-5be0ffa71ad974963f29ed21080362835f49c31c.tar.gz portage-multirepo-5be0ffa71ad974963f29ed21080362835f49c31c.tar.bz2 portage-multirepo-5be0ffa71ad974963f29ed21080362835f49c31c.zip | |
Bug #262485 - Handle InvalidAtom from dep_expand(). (trunk r13116)
svn path=/main/branches/2.1.6/; revision=13123
| -rwxr-xr-x | bin/quickpkg | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/quickpkg b/bin/quickpkg index 92bce027..80bb98b3 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -10,7 +10,7 @@ def quickpkg_main(options, args, eout): from portage import catsplit, dep_expand, flatten, isvalidatom, xpak from portage.dep import use_reduce, paren_reduce from portage.util import ConfigProtect, ensure_dirs - from portage.exception import InvalidData, InvalidDependString + from portage.exception import InvalidAtom, InvalidData, InvalidDependString from portage.dbapi.vartree import dblink, tar_contents from portage.checksum import perform_md5 import tarfile @@ -43,15 +43,16 @@ def quickpkg_main(options, args, eout): del e missing.append(arg) continue - except InvalidData, e: - eout.eerror("Invalid atom: %s" % str(e)) - del e + except (InvalidAtom, InvalidData): + eout.eerror("Invalid atom: %s" % (arg,)) missing.append(arg) continue - if not isvalidatom(atom): - eout.eerror("Invalid atom: %s" % atom) + if atom[:1] == '=' and arg[:1] != '=': + # dep_expand() allows missing '=' but it's really invalid + eout.eerror("Invalid atom: %s" % (arg,)) missing.append(arg) continue + matches = vardb.match(atom) pkgs_for_arg = 0 for cpv in matches: |