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 BC2F1138010 for ; Thu, 20 Sep 2012 03:14:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15C4821C01A; Thu, 20 Sep 2012 03:14:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 616F921C016 for ; Thu, 20 Sep 2012 03:14:17 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C33ED33D389 for ; Thu, 20 Sep 2012 03:14:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 09E9FE5444 for ; Thu, 20 Sep 2012 03:14:15 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1348109801.0b80286311ccc4fbbe9e13015541867f7235a3c9.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/, pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/const.py pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ pym/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 0b80286311ccc4fbbe9e13015541867f7235a3c9 X-VCS-Branch: master Date: Thu, 20 Sep 2012 03:14:15 +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-Archives-Salt: 84739478-b09f-4f86-aa57-bacc7f3d9332 X-Archives-Hash: 28bd0fa66f79852ab6775651686a3606 commit: 0b80286311ccc4fbbe9e13015541867f7235a3c9 Author: Zac Medico gentoo org> AuthorDate: Thu Sep 20 02:56:41 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Sep 20 02:56:41 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0b802863 MAKE_CONF_FILE: refer to /etc/portage/make.conf This is, or will soon soon be the default location of make.conf in stages: http://sources.gentoo.org/gitweb/?p=proj/gentoo-news.git;a=blob_plain;f=2012/2012-09-09-make.conf-and-make.profile-move/2012-09-09-make.conf-and-make.profile-move.en.txt This update is consistent with the PROFILE_PATH update in commit 96b053ac52fa37fdd61cbb76cb44dfb90fb49f86. --- pym/portage/const.py | 2 +- pym/portage/package/ebuild/config.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/portage/const.py b/pym/portage/const.py index 1ebfdc8..fe283f4 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -27,8 +27,8 @@ import os # The variables in this file are grouped by config_root, target_root. # variables used with config_root (these need to be relative) -MAKE_CONF_FILE = "etc/make.conf" USER_CONFIG_PATH = "etc/portage" +MAKE_CONF_FILE = USER_CONFIG_PATH + "/make.conf" MODULES_FILE_PATH = USER_CONFIG_PATH + "/modules" CUSTOM_PROFILE_PATH = USER_CONFIG_PATH + "/profile" USER_VIRTUALS_FILE = USER_CONFIG_PATH + "/virtuals" diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index d2f62ac..2a05904 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -303,11 +303,11 @@ class config(object): abs_user_config = locations_manager.abs_user_config make_conf = getconfig( - os.path.join(config_root, MAKE_CONF_FILE), + os.path.join(config_root, 'etc', 'make.conf'), tolerant=tolerant, allow_sourcing=True) or {} make_conf.update(getconfig( - os.path.join(abs_user_config, 'make.conf'), + os.path.join(config_root, MAKE_CONF_FILE), tolerant=tolerant, allow_sourcing=True, expand=make_conf) or {}) @@ -482,12 +482,12 @@ class config(object): self.configdict["defaults"]=self.configlist[-1] mygcfg = getconfig( - os.path.join(config_root, MAKE_CONF_FILE), + os.path.join(config_root, 'etc', 'make.conf'), tolerant=tolerant, allow_sourcing=True, expand=expand_map) or {} mygcfg.update(getconfig( - os.path.join(abs_user_config, 'make.conf'), + os.path.join(config_root, MAKE_CONF_FILE), tolerant=tolerant, allow_sourcing=True, expand=expand_map) or {})