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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index fe45e3b4e055a971b5161a3b9a742b09e9d1ea55..2b9460462121c99c937274c9204489f0168fb6c4 100644 (file)
--- 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"))