Collapse two repoman PORTAGE_CALLER conditionals into one.

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

diff --git a/pym/portage.py b/pym/portage.py
index be2d8ed542bda6b6b310f5a6a970bfb9435ab05a..e60699d80b44b8a6895f7b5b07deca4f98a9f785 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1077,6 +1077,12 @@ class config:
                        self.lookuplist=self.configlist[:]
                        self.lookuplist.reverse()
 
+                       self.pusedict = {}
+                       self.pkeywordsdict = {}
+                       self.punmaskdict = {}
+                       abs_user_config = os.path.join(config_root,
+                               USER_CONFIG_PATH.lstrip(os.path.sep))
+
                        pmask_locations = [os.path.join(self["PORTDIR"], "profiles")]
                        pmask_locations.extend(self.profiles)
 
@@ -1086,8 +1092,6 @@ class config:
                                locations = [self["PORTDIR"] + "/profiles"]
                                overlay_profiles = []
                        else:
-                               abs_user_config = os.path.join(config_root,
-                                       USER_CONFIG_PATH.lstrip(os.path.sep))
                                locations = [os.path.join(self["PORTDIR"], "profiles"),
                                        abs_user_config]
                                overlay_profiles = []
@@ -1099,14 +1103,9 @@ class config:
                                locations += overlay_profiles
                                
                                pmask_locations.extend(overlay_profiles)
-                               if os.environ.get("PORTAGE_CALLER","") != "repoman":
-                                       pmask_locations.append(abs_user_config)
 
-                       if os.environ.get("PORTAGE_CALLER","") == "repoman":
-                               self.pusedict = {}
-                               self.pkeywordsdict = {}
-                               self.punmaskdict = {}
-                       else:
+                       if os.environ.get("PORTAGE_CALLER","") != "repoman":
+                               pmask_locations.append(abs_user_config)
                                pusedict = grabdict_package(
                                        os.path.join(abs_user_config, "package.use"), recursive=1)
                                self.pusedict = {}