Combine redundant arch_map code inside LinkageMap.rebuild().

svn path=/main/trunk/; revision=11819

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index d80e9a69a6bfa2a6d3c9bb9fca79c3df0a1b5887..0bac6582d5f352c2de79a6158fc85725228c1c31 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -285,11 +285,11 @@ class LinkageMap(object):
                                "${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 @@ class LinkageMap(object):
                                        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(