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 BC1D11381F3 for ; Mon, 12 Aug 2013 21:25:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82307E0960; Mon, 12 Aug 2013 21:25:06 +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 01EFBE09A7 for ; Mon, 12 Aug 2013 21:25:05 +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 0C37B33EA81 for ; Mon, 12 Aug 2013 21:25:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8E32BE468F for ; Mon, 12 Aug 2013 21:25:03 +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: <1376342683.60ce6cc9ad7b050d2cb6a66c84867bd5613a09a2.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py pym/portage/const.py X-VCS-Directories: pym/portage/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 60ce6cc9ad7b050d2cb6a66c84867bd5613a09a2 X-VCS-Branch: master Date: Mon, 12 Aug 2013 21:25:03 +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: 03de8aaf-cd83-4491-977d-069a3971dc99 X-Archives-Hash: efe1d2c8761052c94116898bba91f178 commit: 60ce6cc9ad7b050d2cb6a66c84867bd5613a09a2 Author: Zac Medico gentoo org> AuthorDate: Mon Aug 12 21:24:43 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Aug 12 21:24:43 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=60ce6cc9 Exempt /usr/local/portage from repo_name warning. This will fix bug #248603. --- pym/_emerge/actions.py | 12 ++++++++---- pym/portage/const.py | 1 - 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 4c53c25..52ceba4 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -3518,6 +3518,13 @@ def repo_name_check(trees): # so don't warn about it. missing_repo_names.remove(portdb.porttree_root) + # Skip warnings about missing repo_name entries for + # /usr/local/portage (see bug #248603). + try: + missing_repo_names.remove('/usr/local/portage') + except KeyError: + pass + if missing_repo_names: msg = [] msg.append("WARNING: One or more repositories " + \ @@ -3652,10 +3659,7 @@ def run_action(emerge_config): if "--quiet" not in emerge_config.opts: portage.deprecated_profile_check( settings=emerge_config.target_config.settings) - if portage.const._ENABLE_REPO_NAME_WARN: - # Bug #248603 - Disable warnings about missing - # repo_name entries for stable branch. - repo_name_check(emerge_config.trees) + repo_name_check(emerge_config.trees) repo_name_duplicate_check(emerge_config.trees) config_protect_check(emerge_config.trees) check_procfs() diff --git a/pym/portage/const.py b/pym/portage/const.py index 0638170..bd55cb1 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -180,5 +180,4 @@ SUPPORTED_BINPKG_FORMATS = ("tar", "rpm") # Private constants for use in conditional code in order to minimize the diff # between branches. _DEPCLEAN_LIB_CHECK_DEFAULT = True -_ENABLE_REPO_NAME_WARN = True _ENABLE_SET_CONFIG = True