Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r14479 - main/branches/prefix/pym/portage/dbapi
Date: Sat, 03 Oct 2009 10:08:30
Message-Id: E1Mu1XP-0007UC-7z@stork.gentoo.org
1 Author: grobian
2 Date: 2009-10-03 10:08:26 +0000 (Sat, 03 Oct 2009)
3 New Revision: 14479
4
5 Modified:
6 main/branches/prefix/pym/portage/dbapi/vartree.py
7 Log:
8 linkmap is already of the right type, instantiating a new object based on that seems to work
9
10 Modified: main/branches/prefix/pym/portage/dbapi/vartree.py
11 ===================================================================
12 --- main/branches/prefix/pym/portage/dbapi/vartree.py 2009-10-03 06:59:23 UTC (rev 14478)
13 +++ main/branches/prefix/pym/portage/dbapi/vartree.py 2009-10-03 10:08:26 UTC (rev 14479)
14 @@ -3511,13 +3511,7 @@
15 def path_to_node(path):
16 node = path_node_map.get(path)
17 if node is None:
18 - chost = self.settings.get('CHOST')
19 - if chost.find('darwin') >= 0:
20 - node = LinkageMapMachO._LibGraphNode(path, root)
21 - elif chost.find('interix') >= 0 or chost.find('winnt') >= 0:
22 - node = LinkageMapPeCoff._LibGraphNode(path, root)
23 - else:
24 - node = LinkageMap._LibGraphNode(path, root)
25 + node = linkmap._LibGraphNode(path, root)
26 alt_path_node = lib_graph.get(node)
27 if alt_path_node is not None:
28 node = alt_path_node