Catch ValueError from cpv_expand for bug #131160.

svn path=/main/trunk/; revision=3219

diff --git a/bin/emerge b/bin/emerge
index 3c1f0b15693d3dfbb65103c01f809d425e7f437f..5f7e047bb51b400bece25fd065f0c06e7aa3b29f 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2983,7 +2983,11 @@ elif "config"==myaction:
                portage.writemsg("!!! (Did you specify a version but forget to prefix with '='?)\n")
                sys.exit(1)
        print
-       pkgs = portage.db[portage.root]["vartree"].dbapi.match(myfiles[0])
+       try:
+               pkgs = portage.db[portage.root]["vartree"].dbapi.match(myfiles[0])
+       except ValueError, e:
+               # Multiple matches thrown from cpv_expand
+               pkgs = e.args[0]
        if len(pkgs) == 0:
                print "No packages found.\n"
                sys.exit(0)