Keep filtered USE in the PORTAGE_USE variable to keep

it separate from the global USE that's shown by
emerge --info. (trunk r8963)

svn path=/main/branches/2.1.2/; revision=8964

diff --git a/pym/portage.py b/pym/portage.py
index 9e0a5e6ffc98f67d5c8075377c4d5e9597347169..367fa18677358881a3569de6adf4492acb29eb9c 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1072,7 +1072,8 @@ class config:
                "PORTAGE_ELOG_MAILURI", "PORTAGE_ELOG_SYSTEM", "PORTAGE_GPG_DIR",
                "PORTAGE_GPG_KEY", "PORTAGE_PACKAGE_EMPTY_ABORT",
                "PORTAGE_RSYNC_EXTRA_OPTS", "PORTAGE_RSYNC_OPTS",
-               "PORTAGE_RSYNC_RETRIES", "PORT_LOGDIR", "QUICKPKG_DEFAULT_OPTS",
+               "PORTAGE_RSYNC_RETRIES", "PORTAGE_USE", "PORT_LOGDIR",
+               "QUICKPKG_DEFAULT_OPTS",
                "RESUMECOMMAND", "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTP",
                "RESUMECOMMAND_SFTP", "SYNC", "USE_EXPAND_HIDDEN", "USE_ORDER",
        ]
@@ -1106,7 +1107,6 @@ class config:
                self.already_in_regenerate = 0
 
                self._filter_calling_env = False
-               self._environ_use = ""
                self.locked   = 0
                self.mycpv    = None
                self.puse     = []
@@ -1134,7 +1134,6 @@ class config:
 
                if clone:
                        self._filter_calling_env = copy.deepcopy(clone._filter_calling_env)
-                       self._environ_use = copy.deepcopy(clone._environ_use)
                        self.incrementals = copy.deepcopy(clone.incrementals)
                        self.profile_path = copy.deepcopy(clone.profile_path)
                        self.user_profile_dir = copy.deepcopy(clone.user_profile_dir)
@@ -2421,9 +2420,10 @@ class config:
                # Filtered for the ebuild environment. Store this in a separate
                # attribute since we still want to be able to see global USE
                # settings for things like emerge --info.
-               self._environ_use = " ".join(sorted(
+               self["PORTAGE_USE"] = " ".join(sorted(
                        x for x in usesplit if \
                        x in iuse_implicit))
+               self.backup_changes("PORTAGE_USE")
 
                usesplit.sort()
                self.configlist[-1]["USE"]= " ".join(usesplit)
@@ -2627,8 +2627,8 @@ class config:
                                        if v is not None:
                                                mydict[k] = v
 
-               # Filtered be IUSE / implicit IUSE.
-               mydict["USE"] = self._environ_use
+               # Filtered by IUSE and implicit IUSE.
+               mydict["USE"] = self["PORTAGE_USE"]
 
                # sandbox's bashrc sources /etc/profile which unsets ROOTPATH,
                # so we have to back it up and restore it.