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 39A791381F3 for ; Wed, 19 Jun 2013 01:58:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5212E095D; Wed, 19 Jun 2013 01:58:37 +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 4126BE095D for ; Wed, 19 Jun 2013 01:58:37 +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 4524E33E4A7 for ; Wed, 19 Jun 2013 01:58:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B262FE468F for ; Wed, 19 Jun 2013 01:58:34 +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: <1371607095.a35f183bc219c02057f90823f3ffea9672253b84.zmedico@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: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a35f183bc219c02057f90823f3ffea9672253b84 X-VCS-Branch: master Date: Wed, 19 Jun 2013 01:58:34 +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: 8bcbdb0d-13f8-4b86-bed8-3419556e1592 X-Archives-Hash: b2e22770d7c6923840cf781736d59e8d commit: a35f183bc219c02057f90823f3ffea9672253b84 Author: Zac Medico gentoo org> AuthorDate: Wed Jun 19 01:58:15 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jun 19 01:58:15 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a35f183b RepoConfigLoader: suppress /usr/portage warning Suppress warnings for the make.defaults PORTDIR setting if we have an existing main-repo defined in repos.conf. --- pym/portage/repository/config.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 40fe2c9..6206aff 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -426,6 +426,17 @@ class RepoConfigLoader(object): prepos[repo.name] = repo else: + if base_priority == 0 and ov == '/usr/portage': + # Suppress warnings for the make.defaults + # PORTDIR setting if we have an existing + # main-repo defined in repos.conf. + main_repo = prepos['DEFAULT'].main_repo + if main_repo is not None and main_repo in prepos: + main_repo_loc = prepos[main_repo].location + if main_repo_loc and \ + isdir_raise_eaccess(main_repo_loc): + continue + if not portage._sync_disabled_warnings: writemsg(_("!!! Invalid PORTDIR_OVERLAY (not a dir): '%s'\n") % ov, noiselevel=-1)