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 1ED5D139695 for ; Mon, 10 Jul 2017 23:02:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45645274022; Mon, 10 Jul 2017 23:01:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1AE772741F1 for ; Mon, 10 Jul 2017 23:01:59 +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 0527534196D for ; Mon, 10 Jul 2017 23:01:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A43774AB for ; Mon, 10 Jul 2017 23:01:56 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1499727650.c7f39924f1c7e8579405bd42119e94d3afc9ff31.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: repoman/pym/repoman/repos.py X-VCS-Directories: repoman/pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: c7f39924f1c7e8579405bd42119e94d3afc9ff31 X-VCS-Branch: repoman Date: Mon, 10 Jul 2017 23:01:56 +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: 88e4a8c9-7c98-421f-9598-5fafe183c45a X-Archives-Hash: 3bcba222f94ecc73d600a5d759251936 commit: c7f39924f1c7e8579405bd42119e94d3afc9ff31 Author: Brian Dolbec gentoo org> AuthorDate: Mon Jul 10 21:43:39 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Jul 10 23:00:50 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c7f39924 repoman: repos.py: Add masters_list Use masters_list for loading QAData config. Signed-off-by: Brian Dolbec gentoo.org> repoman/pym/repoman/repos.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/repoman/pym/repoman/repos.py b/repoman/pym/repoman/repos.py index accbf1d9c..605c7cffe 100644 --- a/repoman/pym/repoman/repos.py +++ b/repoman/pym/repoman/repos.py @@ -41,10 +41,18 @@ class RepoSettings(object): except KeyError: self._add_repo(config_root, portdir_overlay) + # Determine the master config loading list + self.masters_list = [] + # get out repo masters value + masters = self.repositories.get_repo_for_location(self.repodir).masters + for repo in masters: + self.masters_list.append(os.path.join(repo.location, 'metadata', 'repoman')) + self.masters_list.append(os.path.join(self.repodir, 'metadata', 'repoman')) + logging.debug("RepoSettings: init(); load qadata") # load the repo specific configuration self.qadata = qadata - if not self.qadata.load_repo_config(self.repodir, options): + if not self.qadata.load_repo_config(self.masters_list, options): logging.error("Aborting...") sys.exit(1) logging.debug("RepoSettings: qadata loaded: %s", qadata.no_exec)