diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-08-15 17:08:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-08-15 17:08:30 +0000 |
| commit | 9e6fdfbcb6dbfe57c844a9cd4b00924e1c7758d9 (patch) | |
| tree | a8af28c70e9cb638a6243feab9ac5756e0266d74 | |
| parent | ef917ae144197e5097a5b3e4faadddaa604d05d2 (diff) | |
| download | portage-9e6fdfbcb6dbfe57c844a9cd4b00924e1c7758d9.tar.gz portage-9e6fdfbcb6dbfe57c844a9cd4b00924e1c7758d9.tar.bz2 portage-9e6fdfbcb6dbfe57c844a9cd4b00924e1c7758d9.zip | |
* 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
| -rw-r--r-- | pym/_emerge/__init__.py | 4 |
1 files changed, 1 insertions, 3 deletions
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" |