| 1 |
Since --autounmask-write was implemented in commit |
| 2 |
c492b1b3ed631b6802ef1192f59d2ef93967fb0a, it did not properly use |
| 3 |
PORTAGE_CONFIGROOT to construct its ConfigProtect instances. The result |
| 4 |
was that CONFIG_PROTECT handling could misbehave when using |
| 5 |
PORTAGE_CONFIGROOT. |
| 6 |
|
| 7 |
Fixes: c492b1b3ed63 ("Implement --autounmask-write") |
| 8 |
X-Gentoo-Bug: 533884 |
| 9 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=533884 |
| 10 |
--- |
| 11 |
pym/_emerge/depgraph.py | 3 ++- |
| 12 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
index 28abea4..3e64bda 100644 |
| 16 |
--- a/pym/_emerge/depgraph.py |
| 17 |
+++ b/pym/_emerge/depgraph.py |
| 18 |
@@ -7870,7 +7870,8 @@ class depgraph(object): |
| 19 |
if write_to_file: |
| 20 |
for root in roots: |
| 21 |
settings = self._frozen_config.roots[root].settings |
| 22 |
- protect_obj[root] = ConfigProtect(settings["EROOT"], \ |
| 23 |
+ protect_obj[root] = ConfigProtect( |
| 24 |
+ settings["PORTAGE_CONFIGROOT"], |
| 25 |
shlex_split(settings.get("CONFIG_PROTECT", "")), |
| 26 |
shlex_split(settings.get("CONFIG_PROTECT_MASK", "")), |
| 27 |
case_insensitive=("case-insensitive-fs" |
| 28 |
-- |
| 29 |
2.0.5 |
Archives