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

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

diff --git a/bin/emerge b/bin/emerge
index 7406608814d4fff0bdee1f1219ca01406a246f38..51f2e19817494484197fcce36754876355e66584 100755 (executable)
--- 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=[]