commit: 417fc75190eb70836de9856f35c8141cacfd49fb
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 29 01:27:57 2014 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jan 5 19:51:43 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=417fc751
emerge --autounmask-write: fix CONFIG_PROTECT for PORTAGE_CONFIGROOT (533884)
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
Acked-by: Alexander Berntsen <bernalex <AT> gentoo.org>
---
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 6266c79..41d6c60 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -7893,7 +7893,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"
