From b8fe6ca6954ffd2c7a85c9f3046cf176b09bc9d7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 17 Dec 2008 05:48:20 +0000 Subject: Inside display_preserved_libs(), filter out consumers that belong to the same package as the provider only if those consumers are also preserved. svn path=/main/trunk/; revision=12257 --- pym/_emerge/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 07e8941a8..667d90fbc 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -11500,15 +11500,16 @@ def display_preserved_libs(vardbapi): else: search_for_owners = set() for cpv in plibdata: - pkg_dblink = vardbapi._dblink(cpv) + internal_plib_keys = set(linkmap._obj_key(f) \ + for f in plibdata[cpv]) for f in plibdata[cpv]: if f in consumer_map: continue consumers = [] for c in linkmap.findConsumers(f): - # Filter out any consumers that belong - # to the same package as the provider. - if not pkg_dblink.isowner(c, pkg_dblink.myroot): + # Filter out any consumers that are also preserved libs + # belonging to the same package as the provider. + if linkmap._obj_key(c) not in internal_plib_keys: consumers.append(c) consumers.sort() consumer_map[f] = consumers -- cgit v1.2.3-1-g7c22