diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-29 21:42:46 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-29 21:42:46 +0000 |
| commit | 987564a2aa71bbe943df85e585060bcca5652216 (patch) | |
| tree | 4e5cbc668d874ccf6cd9901293ec92ef6e60ccba | |
| parent | 51c6672c5251d61ab1278dcb38e63a4a00dc1956 (diff) | |
| download | portage-987564a2aa71bbe943df85e585060bcca5652216.tar.gz portage-987564a2aa71bbe943df85e585060bcca5652216.tar.bz2 portage-987564a2aa71bbe943df85e585060bcca5652216.zip | |
For bug #187016, and env.d to the default USE_ORDER.
svn path=/main/trunk/; revision=7427
| -rw-r--r-- | cnf/make.globals | 2 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index 880df05c1..f857ff439 100644 --- 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 de04a9d1a..28830b6b4 100644 --- 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") |