summaryrefslogtreecommitdiff
path: root/trunk
diff options
context:
space:
mode:
authorfuzzyray <fuzzyray@gentoo.org>2008-02-18 23:48:00 +0000
committerfuzzyray <fuzzyray@gentoo.org>2008-02-18 23:48:00 +0000
commit0902b0b355ff95fe550d2231c71f9af7f7d9c09a (patch)
tree8dcd335cbd07c13b849ed1e6b1cf6c3ebf9497f9 /trunk
parentc24492e3059b55add0fa62acd1b9ec4621697996 (diff)
downloadgentoolkit-0902b0b355ff95fe550d2231c71f9af7f7d9c09a.tar.gz
Fix equery list to not generate an internal portage error when fed input with too many slashes. (Bug 119806)
svn path=/; revision=470
Diffstat (limited to 'trunk')
-rwxr-xr-xtrunk/src/equery/equery8
1 files changed, 7 insertions, 1 deletions
diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery
index 84e3dae..a8be5e3 100755
--- a/trunk/src/equery/equery
+++ b/trunk/src/equery/equery
@@ -1325,7 +1325,13 @@ class CmdListPackages(Command):
cat = ""
if query != "":
- (cat, name, ver, rev) = gentoolkit.split_package_name(query)
+ try: (cat, name, ver, rev) = gentoolkit.split_package_name(query)
+ except ValueError, e:
+ if str(e) == 'too many values to unpack':
+ print_error("A pattern to match against package names was expected, ")
+ warn_msg = "but %s has too many slashes ('/') to match any package."
+ die (1, warn_msg % query)
+ else: raise ValueError(e)
if rev == "r0": rev = ""
package_finder = None