From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1KvHS0-0007j7-Kz for garchives@archives.gentoo.org; Wed, 29 Oct 2008 20:15:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 347E4E0404; Wed, 29 Oct 2008 20:15:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0EF73E040D for ; Wed, 29 Oct 2008 20:15:31 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 49C6A64D78 for ; Wed, 29 Oct 2008 20:15:29 +0000 (UTC) Received: from grobian by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1KvHRx-0002qX-16 for gentoo-commits@lists.gentoo.org; Wed, 29 Oct 2008 20:15:29 +0000 To: gentoo-commits@lists.gentoo.org From: "Fabian Groffen (grobian)" Subject: [gentoo-commits] portage r11745 - main/branches/prefix/pym/portage/dbapi X-VCS-Repository: portage X-VCS-Revision: 11745 X-VCS-Files: main/branches/prefix/pym/portage/dbapi/vartree.py X-VCS-Directories: main/branches/prefix/pym/portage/dbapi X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen Content-Type: text/plain; charset=UTF-8 Message-Id: Sender: Fabian Groffen Date: Wed, 29 Oct 2008 20:15:29 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 43756a9a-06e9-43ee-aa6e-fd0cc052b740 X-Archives-Hash: 8c42a6076cdde08ad7db69766f2a47d6 Author: grobian Date: 2008-10-29 20:15:28 +0000 (Wed, 29 Oct 2008) New Revision: 11745 Modified: main/branches/prefix/pym/portage/dbapi/vartree.py Log: Apply LinkageMap changes to LinkageMapMachO, make sure we call rebuild co= rrectly Modified: main/branches/prefix/pym/portage/dbapi/vartree.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- main/branches/prefix/pym/portage/dbapi/vartree.py 2008-10-29 20:02:41= UTC (rev 11744) +++ main/branches/prefix/pym/portage/dbapi/vartree.py 2008-10-29 20:15:28= UTC (rev 11745) @@ -679,13 +679,15 @@ """ return isinstance(self._key, tuple) =20 - def rebuild(self, include_file=3DNone): + def rebuild(self, exclude_pkgs=3DNone, include_file=3DNone): root =3D self._root libs =3D {} obj_key_cache =3D {} obj_properties =3D {} lines =3D [] for cpv in self._dbapi.cpv_all(): + if exclude_pkgs is not None and cpv in exclude_pkgs: + continue lines +=3D self._dbapi.aux_get(cpv, ["NEEDED.MACHO.3"])[0].split('\n'= ) # Cache NEEDED.* files avoid doing excessive IO for every rebuild. self._dbapi.flush_cache() @@ -2878,9 +2880,10 @@ # read global reverse NEEDED map linkmap =3D self.vartree.dbapi.linkmap if ostype =3D=3D "Darwin": - linkmap.rebuild(include_file=3Dos.path.join(inforoot, "NEEDED.MACHO.3= ")) + neededfile =3D "NEEDED.MACHO.3" else: - linkmap.rebuild(include_file=3Dos.path.join(inforoot, "NEEDED.ELF.2")= ) + neededfile =3D "NEEDED.ELF.2" + linkmap.rebuild(include_file=3Dos.path.join(inforoot, neededfile)) liblist =3D linkmap.listLibraryObjects() =20 # get list of libraries from old package instance @@ -3574,8 +3577,12 @@ writedict(cfgfiledict, conf_mem_file) =20 exclude_pkgs =3D set(dblnk.mycpv for dblnk in others_in_slot) + if ostype =3D=3D "Darwin": + neededfile =3D "NEEDED.MACHO.3" + else: + neededfile =3D "NEEDED.ELF.2" self.vartree.dbapi.linkmap.rebuild(exclude_pkgs=3Dexclude_pkgs, - include_file=3Dos.path.join(inforoot, "NEEDED.ELF.2")) + include_file=3Dos.path.join(inforoot, neededfile)) =20 # These caches are populated during collision-protect and the data # they contain is now invalid. It's very important to invalidate