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 EAA411381F3 for ; Tue, 23 Jul 2013 21:53:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34267E09E8; Tue, 23 Jul 2013 21:53:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B49D3E09E8 for ; Tue, 23 Jul 2013 21:53:31 +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 7F4F5335DF3 for ; Tue, 23 Jul 2013 21:53:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E8B24E5458 for ; Tue, 23 Jul 2013 21:53:28 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1374616367.ddf615015eea5d9800cce027708bfd3035c6472c.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/repository/config.py X-VCS-Directories: pym/portage/repository/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: ddf615015eea5d9800cce027708bfd3035c6472c X-VCS-Branch: master Date: Tue, 23 Jul 2013 21:53:28 +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: 25681fd7-5c80-46b8-ab30-97c7311bb1b0 X-Archives-Hash: fb45738baf90c6e12b066f70442d9ec3 commit: ddf615015eea5d9800cce027708bfd3035c6472c Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Tue Jul 23 21:52:47 2013 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gmail com> CommitDate: Tue Jul 23 21:52:47 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ddf61501 Add warning for missing masters attribute in layout.conf. --- pym/portage/repository/config.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 1bfe2f8..68e8121 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -197,7 +197,6 @@ class RepoConfig(object): # Parse layout.conf. if self.location: - layout_filename = os.path.join(self.location, "metadata", "layout.conf") layout_data = parse_layout_conf(self.location, self.name)[0] # layout.conf masters may be overridden here if we have a masters @@ -767,6 +766,17 @@ class RepoConfigLoader(object): eclass_db.append(tree_db) repo.eclass_db = eclass_db + for repo_name, repo in prepos.items(): + if repo_name == "DEFAULT": + continue + + if parse_layout_conf(repo.location, repo_name)[0]["masters"] is None and self.mainRepo() and \ + repo_name != self.mainRepo().name and not portage._sync_disabled_warnings: + writemsg_level("!!! %s\n" % _("Repository '%s' is missing masters attribute in '%s'") % + (repo_name, os.path.join(repo.location, "metadata", "layout.conf")) + + "!!! %s\n" % _("Set 'masters = %s' in this file for future compatibility") % + self.mainRepo().name, level=logging.WARNING, noiselevel=-1) + self._prepos_changed = True self._repo_location_list = []