From 655b89d9a1c5f7f3d3d3a5c1e62db82ec677bd89 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 22 Jul 2006 06:54:00 +0000 Subject: Just add the providers to the protected set without bothering to check if they're in the vdb. svn path=/main/trunk/; revision=3987 --- bin/emerge | 11 +++++------ 1 file 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=[] -- cgit v1.2.3-1-g7c22