summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-22 06:54:00 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-22 06:54:00 +0000
commit655b89d9a1c5f7f3d3d3a5c1e62db82ec677bd89 (patch)
tree0ceca84280eb8f0f5ebf76482fc63cd3024fcccc
parent61dbcb8ebf741610ca8f7d77f6deefe576372b18 (diff)
downloadportage-655b89d9a1c5f7f3d3d3a5c1e62db82ec677bd89.tar.gz
portage-655b89d9a1c5f7f3d3d3a5c1e62db82ec677bd89.tar.bz2
portage-655b89d9a1c5f7f3d3d3a5c1e62db82ec677bd89.zip
Just add the providers to the protected set without bothering to check if they're in the vdb.
svn path=/main/trunk/; revision=3987
-rwxr-xr-xbin/emerge11
1 files changed, 5 insertions, 6 deletions
diff --git a/bin/emerge b/bin/emerge
index 740660881..51f2e1981 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3258,12 +3258,11 @@ def action_depclean(settings, trees, ldpath_mtimes,
from itertools import chain
for x in chain(syslist, worldlist):
mycp = portage.dep_getkey(x)
- if mycp in settings.getvirtuals():
- providers = []
- for provider in settings.getvirtuals()[mycp]:
- if vartree.dbapi.match(provider):
- providers.append(provider)
- sys_world_unversioned.update(providers)
+ try:
+ # include any old-style virtual providers that may exist
+ sys_world_unversioned.update(settings.getvirtuals()[mycp])
+ except KeyError:
+ pass
sys_world_unversioned.add(mycp)
cleanlist=[]