Just add the providers to the protected set without bothering to check if they're in the vdb.

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

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=[]