public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-portage-dev] [PATCH] emerge --autounmask-write: fix CONFIG_PROTECT for PORTAGE_CONFIGROOT (533884)
@ 2014-12-29  1:27 Zac Medico
  2015-01-05 13:10 ` Alexander Berntsen
  0 siblings, 1 reply; 2+ messages in thread
From: Zac Medico @ 2014-12-29  1:27 UTC (permalink / raw
  To: gentoo-portage-dev; +Cc: Zac Medico

Since --autounmask-write was implemented in commit
c492b1b3ed631b6802ef1192f59d2ef93967fb0a, it did not properly use
PORTAGE_CONFIGROOT to construct its ConfigProtect instances. The result
was that CONFIG_PROTECT handling could misbehave when using
PORTAGE_CONFIGROOT.

Fixes: c492b1b3ed63 ("Implement --autounmask-write")
X-Gentoo-Bug: 533884
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=533884
---
 pym/_emerge/depgraph.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 28abea4..3e64bda 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -7870,7 +7870,8 @@ class depgraph(object):
 		if write_to_file:
 			for root in roots:
 				settings = self._frozen_config.roots[root].settings
-				protect_obj[root] = ConfigProtect(settings["EROOT"], \
+				protect_obj[root] = ConfigProtect(
+					settings["PORTAGE_CONFIGROOT"],
 					shlex_split(settings.get("CONFIG_PROTECT", "")),
 					shlex_split(settings.get("CONFIG_PROTECT_MASK", "")),
 					case_insensitive=("case-insensitive-fs"
-- 
2.0.5



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [gentoo-portage-dev] [PATCH] emerge --autounmask-write: fix CONFIG_PROTECT for PORTAGE_CONFIGROOT (533884)
  2014-12-29  1:27 [gentoo-portage-dev] [PATCH] emerge --autounmask-write: fix CONFIG_PROTECT for PORTAGE_CONFIGROOT (533884) Zac Medico
@ 2015-01-05 13:10 ` Alexander Berntsen
  0 siblings, 0 replies; 2+ messages in thread
From: Alexander Berntsen @ 2015-01-05 13:10 UTC (permalink / raw
  To: gentoo-portage-dev

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Nice. Go ahead & merge.

- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iF4EAREIAAYFAlSqjVgACgkQRtClrXBQc7WW1wD/Qv9YWiwP6+6o696t4Rpd8y+w
WbdXPCYfrgqOP8/SY4EA/idLVn+k4KKYTLCrlCTlxFxJax36p5CjAS4o9ArA+uUt
=Vx/6
-----END PGP SIGNATURE-----


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-01-05 13:10 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-29  1:27 [gentoo-portage-dev] [PATCH] emerge --autounmask-write: fix CONFIG_PROTECT for PORTAGE_CONFIGROOT (533884) Zac Medico
2015-01-05 13:10 ` Alexander Berntsen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox