summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-01 22:06:15 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-01 22:06:15 +0000
commitabf964a4690c987e541ed831dc33274618b69f4d (patch)
treeec6a0aad4ef76afde588d2ace0282b3ec64d2d67
parent92bf8dbf78325e0b365bed7b736695ec226dd6a4 (diff)
downloadportage-abf964a4690c987e541ed831dc33274618b69f4d.tar.gz
portage-abf964a4690c987e541ed831dc33274618b69f4d.tar.bz2
portage-abf964a4690c987e541ed831dc33274618b69f4d.zip
TODO: In case some elf files collide with blocked packages,
ensure that NEEDED data from include_file overrides the stale NEEDED data from the colliding files in the blocked packages. svn path=/main/trunk/; revision=11788
-rw-r--r--pym/portage/dbapi/vartree.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index fe45e3b4e..2b9460462 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3286,6 +3286,9 @@ class dblink(object):
gid=portage_gid, mode=02750, mask=02)
writedict(cfgfiledict, conf_mem_file)
+ # TODO: In case some elf files collide with blocked packages,
+ # ensure that NEEDED data from include_file overrides the stale
+ # NEEDED data from the colliding files in the blocked packages.
exclude_pkgs = set(dblnk.mycpv for dblnk in others_in_slot)
self.vartree.dbapi.linkmap.rebuild(exclude_pkgs=exclude_pkgs,
include_file=os.path.join(inforoot, "NEEDED.ELF.2"))