For bug #187016, and env.d to the default USE_ORDER.

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

diff --git a/cnf/make.globals b/cnf/make.globals
index 880df05c15427d7f4f369c78a18960bfddecd7b2..f857ff4392464a00cea9ae36465ab08732f9b354 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -61,7 +61,7 @@ CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d"
 
 # Disable auto-use
-USE_ORDER="env:pkg:conf:defaults:pkginternal"
+USE_ORDER="env:pkg:conf:defaults:pkginternal:env.d"
 
 # Default ownership of installed files.
 PORTAGE_INST_UID="0"

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index de04a9d1a1aa894a82b7233bbc683f297133fa66..28830b6b4cfcd8cdaec09cfeabdd7533183d4817 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1384,7 +1384,7 @@ class config(object):
                        # reasonable defaults; this is important as without USE_ORDER,
                        # USE will always be "" (nothing set)!
                        if "USE_ORDER" not in self:
-                               self.backupenv["USE_ORDER"] = "env:pkg:conf:defaults:pkginternal"
+                               self.backupenv["USE_ORDER"] = "env:pkg:conf:defaults:pkginternal:env.d"
 
                        self["PORTAGE_GID"] = str(portage_gid)
                        self.backup_changes("PORTAGE_GID")