From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 12 Aug 2013 21:24:43 +0000 (-0700)
Subject: Exempt /usr/local/portage from repo_name warning.
X-Git-Tag: v2.2.0~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60ce6cc9ad7b050d2cb6a66c84867bd5613a09a2;p=portage.git

Exempt /usr/local/portage from repo_name warning.

This will fix bug #248603.
---

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 4c53c255a..52ceba49e 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 0638170f3..bd55cb1a8 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