Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r11788 - main/trunk/pym/portage/dbapi
Date: Sat, 01 Nov 2008 22:06:19
Message-Id: E1KwObo-00040r-Er@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-11-01 22:06:15 +0000 (Sat, 01 Nov 2008)
3 New Revision: 11788
4
5 Modified:
6 main/trunk/pym/portage/dbapi/vartree.py
7 Log:
8 TODO: In case some elf files collide with blocked packages,
9 ensure that NEEDED data from include_file overrides the stale
10 NEEDED data from the colliding files in the blocked packages.
11
12
13 Modified: main/trunk/pym/portage/dbapi/vartree.py
14 ===================================================================
15 --- main/trunk/pym/portage/dbapi/vartree.py 2008-11-01 21:10:02 UTC (rev 11787)
16 +++ main/trunk/pym/portage/dbapi/vartree.py 2008-11-01 22:06:15 UTC (rev 11788)
17 @@ -3286,6 +3286,9 @@
18 gid=portage_gid, mode=02750, mask=02)
19 writedict(cfgfiledict, conf_mem_file)
20
21 + # TODO: In case some elf files collide with blocked packages,
22 + # ensure that NEEDED data from include_file overrides the stale
23 + # NEEDED data from the colliding files in the blocked packages.
24 exclude_pkgs = set(dblnk.mycpv for dblnk in others_in_slot)
25 self.vartree.dbapi.linkmap.rebuild(exclude_pkgs=exclude_pkgs,
26 include_file=os.path.join(inforoot, "NEEDED.ELF.2"))