From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 03F411389E2 for ; Mon, 29 Dec 2014 01:28:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 214EAE0B48; Mon, 29 Dec 2014 01:28:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B23FE0B47 for ; Mon, 29 Dec 2014 01:28:07 +0000 (UTC) Received: from localhost.localdomain (ip70-181-96-121.oc.oc.cox.net [70.181.96.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id 7F5F2340667; Mon, 29 Dec 2014 01:28:06 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] emerge --autounmask-write: fix CONFIG_PROTECT for PORTAGE_CONFIGROOT (533884) Date: Sun, 28 Dec 2014 17:27:57 -0800 Message-Id: <1419816477-23759-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.0.5 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 02b30c34-65b7-473f-b818-629cae0940c7 X-Archives-Hash: bd8396bd8985772e0f80f574c60a6e02 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