* Replace vartree.dep_match() call with normal dbapi.match() call.

* Don't silently swallow unexpected KeyError exceptions from dbapi.match()
  inside unmerge().

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a900dbb61cd6e9e7bc27758664e134d72965a483..d219604495df260bf7cdc99135a644365ec22e9b 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -10329,9 +10329,7 @@ def unmerge(root_config, myopts, unmerge_action,
                        # cycle through all our candidate deps and determine
                        # what will and will not get unmerged
                        try:
-                               mymatch=localtree.dep_match(x)
-                       except KeyError:
-                               mymatch=None
+                               mymatch = vartree.dbapi.match(x)
                        except ValueError, errpkgs:
                                print "\n\n!!! The short ebuild name \"" + \
                                        x + "\" is ambiguous.  Please specify"