| 1 |
commit: d8e8accc142cce05d558d841c92e6e0249445ebf |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 9 01:26:34 2015 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 9 01:29:59 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d8e8accc |
| 7 |
|
| 8 |
config: fix default USE_ORDER setting |
| 9 |
|
| 10 |
This may fix the USE_ORDER KeyError that's been causing testFakedbapi |
| 11 |
to fail for travis-ci. |
| 12 |
|
| 13 |
pym/portage/package/ebuild/config.py | 3 ++- |
| 14 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 17 |
index b6217e7..975fe88 100644 |
| 18 |
--- a/pym/portage/package/ebuild/config.py |
| 19 |
+++ b/pym/portage/package/ebuild/config.py |
| 20 |
@@ -838,7 +838,8 @@ class config(object): |
| 21 |
# reasonable defaults; this is important as without USE_ORDER, |
| 22 |
# USE will always be "" (nothing set)! |
| 23 |
if "USE_ORDER" not in self: |
| 24 |
- self.backupenv["USE_ORDER"] = "env:pkg:conf:defaults:pkginternal:repo:env.d" |
| 25 |
+ self["USE_ORDER"] = "env:pkg:conf:defaults:pkginternal:repo:env.d" |
| 26 |
+ self.backup_changes("USE_ORDER") |
| 27 |
|
| 28 |
if "CBUILD" not in self and "CHOST" in self: |
| 29 |
self["CBUILD"] = self["CHOST"] |
Archives