| 1 |
commit: 3ccd41702be7ed3f5bdbe123ec04349749b40c08 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 9 21:31:21 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 10 01:45:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3ccd4170 |
| 7 |
|
| 8 |
config.setcpv: fix handling of IUSE changes (bug 611896) |
| 9 |
|
| 10 |
Fix setcpv to correctly regenerate USE when the IUSE differs from |
| 11 |
the previous setcpv call. Changes in IUSE affect USE_EXPAND |
| 12 |
wildcard expansion in the regenerate method. |
| 13 |
|
| 14 |
X-Gentoo-bug: 611896 |
| 15 |
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=611896 |
| 16 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 17 |
|
| 18 |
pym/portage/package/ebuild/config.py | 7 +++++-- |
| 19 |
1 file changed, 5 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 22 |
index 4f7e5c93c..ef29afeab 100644 |
| 23 |
--- a/pym/portage/package/ebuild/config.py |
| 24 |
+++ b/pym/portage/package/ebuild/config.py |
| 25 |
@@ -1623,6 +1623,10 @@ class config(object): |
| 26 |
elif previous_penv: |
| 27 |
has_changed = True |
| 28 |
|
| 29 |
+ if not (previous_iuse == iuse and |
| 30 |
+ previous_iuse_effective is not None == eapi_attrs.iuse_effective): |
| 31 |
+ has_changed = True |
| 32 |
+ |
| 33 |
if has_changed: |
| 34 |
self.reset(keeping_pkg=1) |
| 35 |
|
| 36 |
@@ -1645,8 +1649,7 @@ class config(object): |
| 37 |
|
| 38 |
# If reset() has not been called, it's safe to return |
| 39 |
# early if IUSE has not changed. |
| 40 |
- if not has_changed and previous_iuse == iuse and \ |
| 41 |
- (previous_iuse_effective is not None == eapi_attrs.iuse_effective): |
| 42 |
+ if not has_changed: |
| 43 |
return |
| 44 |
|
| 45 |
# Filter out USE flags that aren't part of IUSE. This has to |
Archives