Remove duplicate profile.env values from the environment so that they don't override...

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

diff --git a/pym/portage.py b/pym/portage.py
index 5dae564162b8d1fa3295972d8a11f5ac83a7947e..dc4ea15df0d4c4432b27eab7e92ed3c107de071d 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1019,6 +1019,24 @@ class config:
                                                pass
                        del blacklisted, cfg
 
+                       env_d = getconfig(
+                               os.path.join(config_root, "etc", "profile.env"))
+                       # env_d will be None if profile.env doesn't exist.
+                       if env_d:
+                               self.configdict["env.d"].update(env_d)
+                               # Remove duplicate values so they don't override updated
+                               # profile.env values later (profile.env is reloaded in each
+                               # call to self.regenerate).
+                               for cfg in (self.configdict["backupenv"],
+                                       self.configdict["env"]):
+                                       for k, v in env_d.iteritems():
+                                               try:
+                                                       if cfg[k] == v:
+                                                               del cfg[k]
+                                               except KeyError:
+                                                       pass
+                               del cfg, k, v
+
                        self["PORTAGE_CONFIGROOT"] = config_root
                        self.backup_changes("PORTAGE_CONFIGROOT")
                        self["ROOT"] = target_root