public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Zac Medico <zmedico@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Cc: Zac Medico <zmedico@gentoo.org>
Subject: [gentoo-portage-dev] [PATCH] emerge --autounmask-write: fix CONFIG_PROTECT for PORTAGE_CONFIGROOT (533884)
Date: Sun, 28 Dec 2014 17:27:57 -0800	[thread overview]
Message-ID: <1419816477-23759-1-git-send-email-zmedico@gentoo.org> (raw)

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



             reply	other threads:[~2014-12-29  1:28 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-29  1:27 Zac Medico [this message]
2015-01-05 13:10 ` [gentoo-portage-dev] [PATCH] emerge --autounmask-write: fix CONFIG_PROTECT for PORTAGE_CONFIGROOT (533884) Alexander Berntsen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1419816477-23759-1-git-send-email-zmedico@gentoo.org \
    --to=zmedico@gentoo.org \
    --cc=gentoo-portage-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox