From 219c473c1f42c31e60f3d5a9ccd4f9e2b7d2bbe6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 31 Jul 2006 18:16:24 +0000 Subject: Make depclean account for old-style virtuals so that it doesn't remove the providers. See bug #136178. This patch is from trunk r3985:3987. svn path=/main/branches/2.1/; revision=4067 --- bin/emerge | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 1b5de9765..1f86800d1 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3343,7 +3343,13 @@ elif "depclean"==myaction: sys_world_unversioned = set() from itertools import chain for x in chain(syslist, worldlist): - sys_world_unversioned.add(portage.dep_getkey(x)) + mycp = portage.dep_getkey(x) + try: + # include any old-style virtual providers that may exist + sys_world_unversioned.update(portage.settings.getvirtuals()[mycp]) + except KeyError: + pass + sys_world_unversioned.add(mycp) cleanlist=[] for x in myvarlist: -- cgit v1.2.3-1-g7c22