Bug #288551 - Fix portageq to handle portage.exception.AmbiguousPackageName

instead of ValueError. (trunk r14577)

svn path=/main/branches/2.1.7/; revision=14578

diff --git a/bin/portageq b/bin/portageq
index dea77836b3d22a955f716a6938ad4d9141d10e3c..972e78e2a0fee42b60aa22c3a49646762244a25e 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -603,11 +603,7 @@ def main():
        except portage.exception.ParseError as e:
                sys.stderr.write("%s\n" % str(e))
                sys.exit(1)
-       except ValueError as e:
-               if not e.args or \
-                       not hasattr(e.args[0], "__len__") or \
-                       len(e.args[0]) < 2:
-                       raise
+       except portage.exception.AmbiguousPackageName as e:
                # Multiple matches thrown from cpv_expand
                pkgs = e.args[0]
                # An error has occurred so we writemsg to stderr and exit nonzero.