From: Zac Medico Date: Sat, 1 Nov 2008 22:06:15 +0000 (-0000) Subject: TODO: In case some elf files collide with blocked packages, X-Git-Tag: v2.2_rc13~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=abf964a4690c987e541ed831dc33274618b69f4d;p=portage.git 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 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"))