From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 338BE138334 for ; Mon, 10 Jun 2019 10:09:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9ABDE0871; Mon, 10 Jun 2019 10:09:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96815E0871 for ; Mon, 10 Jun 2019 10:09:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA9C7345B71 for ; Mon, 10 Jun 2019 10:09:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 437DF617 for ; Mon, 10 Jun 2019 10:09:06 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1560160810.77562c57f97eb621d3f777f1302073e7ba95ec04.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: main.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 77562c57f97eb621d3f777f1302073e7ba95ec04 X-VCS-Branch: master Date: Mon, 10 Jun 2019 10:09:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1077dc8f-b7a3-4214-b73f-bdfe9d822efb X-Archives-Hash: f057976111ac7a3f350e1b57f16b2a13 commit: 77562c57f97eb621d3f777f1302073e7ba95ec04 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jun 10 10:00:10 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Jun 10 10:00:10 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=77562c57 main: CONFIG_PROTECT should not be prefixed CONFIG_PROTECT and CONFIG_PROTECT_MASK come from profiles, and therefore cannot hold EPREFIX. The consuming code has to deal with that, so don't add EPREFIX to the default value. Signed-off-by: Fabian Groffen gentoo.org> main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index b07eb5a..56a05d3 100644 --- a/main.c +++ b/main.c @@ -609,7 +609,7 @@ initialize_portage_env(void) _Q_EVS(ISTR, INSTALL_MASK, install_mask, "") _Q_EVS(ISTR, PKG_INSTALL_MASK, pkg_install_mask, "") _Q_EVS(STR, ARCH, portarch, "") - _Q_EVS(ISTR, CONFIG_PROTECT, config_protect, CONFIG_EPREFIX "etc") + _Q_EVS(ISTR, CONFIG_PROTECT, config_protect, "/etc") _Q_EVS(ISTR, CONFIG_PROTECT_MASK, config_protect_mask, "") _Q_EVB(BOOL, NOCOLOR, nocolor, 0) _Q_EVS(ISTR, FEATURES, features, "")