From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 11 Oct 2009 23:01:30 +0000 (-0000)
Subject: Bug #288551 - Fix portageq to handle portage.exception.AmbiguousPackageName
X-Git-Tag: v2.1.7.1~8
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4a51226706894b78c249fd095025cdd24501d389;p=portage.git

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 dea77836b..972e78e2a 100755
--- 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.