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 4c53c255a01e9cf7412ca33b30d4ce2b3ac492cd..52ceba49e2cdaf57fcf8b236c7aaae03bcd74d56 100644 (file)
--- 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 0638170f33f9335f9a30979b0f5cebd4749f9f6c..bd55cb1a86183bfe616e7b2878001e228f072116 100644 (file)
--- 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