[patch] config.setcpv: fix bug #522362

config.setcpv-fix-bug-522362.patch (text/plain), 1.16 KB, created by Zac Medico on 2014-09-08 07:30:54 UTC

From b63bb8a983e3d9d4ab0944c7cfa82cad611cf456 Mon Sep 17 00:00:00 2001
From: Zac Medico <[e-mail]>
Date: Mon, 8 Sep 2014 00:27:34 -0700
Subject: [PATCH] config.setcpv: fix bug #522362

Fix config.setcpv to regenerate USE settings in order to account for
package.env USE settings from the previous package instance.

X-Gentoo-Bug: 522362
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=522362
---
 pym/portage/package/ebuild/config.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index f639e14..264ed8e 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1360,6 +1360,7 @@ class config(object):
 		previous_iuse = pkg_configdict.get("IUSE")
 		previous_iuse_effective = pkg_configdict.get("IUSE_EFFECTIVE")
 		previous_features = pkg_configdict.get("FEATURES")
+		previous_penv = self._penv
 
 		aux_keys = self._setcpv_aux_keys
 
@@ -1527,6 +1528,9 @@ class config(object):
 				else:
 					pkg_configdict['USE'] = self.puse
 
+		elif previous_penv:
+			has_changed = True
+
 		if has_changed:
 			self.reset(keeping_pkg=1)
 
-- 
1.8.5.5