From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 15 Aug 2008 17:08:30 +0000 (-0000)
Subject: * Replace vartree.dep_match() call with normal dbapi.match() call.
X-Git-Tag: v2.2_rc9~89
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e6fdfbcb6dbfe57c844a9cd4b00924e1c7758d9;p=portage.git

* 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 a900dbb61..d21960449 100644
--- 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"