diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2014-12-28 17:27:57 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2015-01-05 11:51:43 -0800 |
| commit | 417fc75190eb70836de9856f35c8141cacfd49fb (patch) | |
| tree | 4bd9b20e837676ea661c6098a8c467fe1ede34be | |
| parent | Solve more slot-operator conflicts (531656) (diff) | |
| download | portage-417fc75190eb70836de9856f35c8141cacfd49fb.tar.gz portage-417fc75190eb70836de9856f35c8141cacfd49fb.tar.bz2 portage-417fc75190eb70836de9856f35c8141cacfd49fb.zip | |
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@gentoo.org>
| -rw-r--r-- | pym/_emerge/depgraph.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 6266c79c8..41d6c60ea 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" |