Note: Due to technical difficulties, the Archives are currently not up to date.
GMANE provides an alternative service for most mailing lists. c.f. bug 424647
Author: zmedico
Date: 2008-11-07 16:23:36 +0000 (Fri, 07 Nov 2008)
New Revision: 11819
Modified:
main/trunk/pym/portage/dbapi/vartree.py
Log:
Combine redundant arch_map code inside LinkageMap.rebuild().
Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py 2008-11-07 16:09:59 UTC (rev 11818)
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-11-07 16:23:36 UTC (rev 11819)
@@ -285,11 +285,11 @@
"${ORIGIN}", os.path.dirname(obj)).replace(
"$ORIGIN", os.path.dirname(obj)).split(":"))])
needed = filter(None, fields[4].split(","))
+ arch_map = libs.get(arch)
+ if arch_map is None:
+ arch_map = {}
+ libs[arch] = arch_map
if soname:
- arch_map = libs.get(arch)
- if arch_map is None:
- arch_map = {}
- libs[arch] = arch_map
soname_map = arch_map.get(soname)
if soname_map is None:
soname_map = self._soname_map_class(
@@ -297,10 +297,6 @@
arch_map[soname] = soname_map
soname_map.providers.add(obj_key)
for needed_soname in needed:
- arch_map = libs.get(arch)
- if arch_map is None:
- arch_map = {}
- libs[arch] = arch_map
soname_map = arch_map.get(needed_soname)
if soname_map is None:
soname_map = self._soname_map_class(
|
|
