Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10176 - main/branches/prefix/pym/portage/dbapi
Date: Sun, 04 May 2008 11:32:26
Message-Id: E1JscS8-0001UQ-5k@stork.gentoo.org
1 Author: grobian
2 Date: 2008-05-04 11:32:23 +0000 (Sun, 04 May 2008)
3 New Revision: 10176
4
5 Modified:
6 main/branches/prefix/pym/portage/dbapi/vartree.py
7 Log:
8 (In theory) use the MachO linkage map on Darwin
9
10 Modified: main/branches/prefix/pym/portage/dbapi/vartree.py
11 ===================================================================
12 --- main/branches/prefix/pym/portage/dbapi/vartree.py 2008-05-04 11:26:50 UTC (rev 10175)
13 +++ main/branches/prefix/pym/portage/dbapi/vartree.py 2008-05-04 11:32:23 UTC (rev 10176)
14 @@ -5,7 +5,7 @@
15 from portage.checksum import perform_md5
16 from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, PORTAGE_BIN_PATH, \
17 PRIVATE_PATH, VDB_PATH, EPREFIX, EPREFIX_LSTRIP
18 -from portage.data import portage_gid, portage_uid, secpass
19 +from portage.data import portage_gid, portage_uid, secpass, ostype
20 from portage.dbapi import dbapi
21 from portage.dep import dep_getslot, use_reduce, paren_reduce, isvalidatom, \
22 isjustname, dep_getkey, match_from_list
23 @@ -400,7 +400,10 @@
24 # apparently this user isn't allowed to access PRIVATE_PATH
25 self.plib_registry = None
26
27 - self.linkmap = LinkageMap(self)
28 + if ostype == "Darwin":
29 + self.linkmap = LinkageMapMachO(self)
30 + else:
31 + self.linkmap = LinkageMap(self)
32
33 def getpath(self, mykey, filename=None):
34 rValue = os.path.join(self.root, VDB_PATH, mykey)
35
36 --
37 gentoo-commits@l.g.o mailing list