diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-07 21:40:21 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-07 21:40:21 +0000 |
| commit | 06fa273bc44126e72ca8e9170614cb0a40b59c72 (patch) | |
| tree | d50a8a27e4087bcc4ebf214079bb16e143586b25 | |
| parent | fe7fad15b2f678d3b8ededf13b8a8f935c38dbdb (diff) | |
| download | portage-06fa273bc44126e72ca8e9170614cb0a40b59c72.tar.gz portage-06fa273bc44126e72ca8e9170614cb0a40b59c72.tar.bz2 portage-06fa273bc44126e72ca8e9170614cb0a40b59c72.zip | |
Replace NEEDED.ELF.2 strings with references to LinkageMap._needed_aux_key.
svn path=/main/trunk/; revision=11824
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index f306420ef..cce5b69f0 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2464,7 +2464,8 @@ class dblink(object): showMessage = self._display_merge # read global reverse NEEDED map linkmap = self.vartree.dbapi.linkmap - linkmap.rebuild(include_file=os.path.join(inforoot, "NEEDED.ELF.2")) + linkmap.rebuild(include_file=os.path.join(inforoot, + linkmap._needed_aux_key)) liblist = linkmap.listLibraryObjects() # get list of libraries from old package instance @@ -3348,8 +3349,9 @@ class dblink(object): writedict(cfgfiledict, conf_mem_file) 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")) + linkmap = self.vartree.dbapi.linkmap + linkmap.rebuild(exclude_pkgs=exclude_pkgs, + include_file=os.path.join(inforoot, linkmap._needed_aux_key)) # These caches are populated during collision-protect and the data # they contain is now invalid. It's very important to invalidate |