RepoConfigLoader: suppress /usr/portage warning

Suppress warnings for the make.defaults PORTDIR setting if we have an
existing main-repo defined in repos.conf.

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 40fe2c9c881e2ea5263e45297f525e21c0541171..6206affb40a3f7df840e2c15514a0b8e763975ed 100644 (file)
--- 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)