Bug #434970: Disable some warnings during `emerge --sync`.

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 5d1110a08e59f7b48b2775d1b3af4a8ce6006650..3003afc65c1f1070b9a36a7640cc7071a0236a62 100644 (file)
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2468,6 +2468,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
                return 1
 
        # Reload the whole config from scratch.
+       portage._sync_disabled_warnings = False
        settings, trees, mtimedb = load_emerge_config(trees=trees)
        adjust_configs(myopts, trees)
        root_config = trees[settings['EROOT']]['root_config']

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index e3557e5742f905e6d31d47175167e2758cfbc16d..dad144c7d1c170a63c9d8c6bca9223ad6eba96f6 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1655,6 +1655,8 @@ def emerge_main(args=None):
 
        # Portage needs to ensure a sane umask for the files it creates.
        os.umask(0o22)
+       if myaction == "sync":
+               portage._sync_disabled_warnings = True
        settings, trees, mtimedb = load_emerge_config()
        portdb = trees[settings['EROOT']]['porttree'].dbapi
        rval = profile_check(trees, myaction)

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 695f1ea0a2f4d9d29dd662cbbc45ae545d777794..9119b25bb8980a366072d7e9b1b8520bf945132f 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -328,6 +328,8 @@ _python_interpreter = os.path.realpath(sys.executable)
 _bin_path = PORTAGE_BIN_PATH
 _pym_path = PORTAGE_PYM_PATH
 
+_sync_disabled_warnings = False
+
 def _shell_quote(s):
        """
        Quote a string in double-quotes and use backslashes to

diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index c3099d73fe725e5244a3df93b35326b50e350e2c..1ca2b324d34946c15428ae6a1d83a084642fb7c6 100644 (file)
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -100,9 +100,9 @@ class LocationsManager(object):
                                self._addProfile(os.path.realpath(self.profile_path),
                                        repositories, known_repos)
                        except ParseError as e:
-                               writemsg(_("!!! Unable to parse profile: '%s'\n") % \
-                                       self.profile_path, noiselevel=-1)
-                               writemsg("!!! ParseError: %s\n" % str(e), noiselevel=-1)
+                               if not portage._sync_disabled_warnings:
+                                       writemsg(_("!!! Unable to parse profile: '%s'\n") % self.profile_path, noiselevel=-1)
+                                       writemsg("!!! ParseError: %s\n" % str(e), noiselevel=-1)
                                self.profiles = []
                                self.profiles_complex = []
 

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 83018b8a60460296d971ebb996879d91be7261ac..71f548ca48088fc263c5ce0edfbac76a1b98e2d2 100644 (file)
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -15,6 +15,7 @@ try:
                from configparser import SafeConfigParser
 except ImportError:
        from ConfigParser import SafeConfigParser, ParsingError
+import portage
 from portage import eclass_cache, os
 from portage.const import (MANIFEST2_HASH_FUNCTIONS, MANIFEST2_REQUIRED_HASH,
        REPO_NAME_LOC, USER_CONFIG_PATH)
@@ -396,8 +397,8 @@ class RepoConfigLoader(object):
 
                                        prepos[repo.name] = repo
                                else:
-                                       writemsg(_("!!! Invalid PORTDIR_OVERLAY"
-                                               " (not a dir): '%s'\n") % ov, noiselevel=-1)
+                                       if not portage._sync_disabled_warnings:
+                                               writemsg(_("!!! Invalid PORTDIR_OVERLAY (not a dir): '%s'\n") % ov, noiselevel=-1)
 
                return portdir
 
@@ -521,7 +522,8 @@ class RepoConfigLoader(object):
                                prepos['DEFAULT'].main_repo = ignored_location_map[portdir]
                        else:
                                prepos['DEFAULT'].main_repo = None
-                               writemsg(_("!!! main-repo not set in DEFAULT and PORTDIR is empty. \n"), noiselevel=-1)
+                               if not portage._sync_disabled_warnings:
+                                       writemsg(_("!!! main-repo not set in DEFAULT and PORTDIR is empty.\n"), noiselevel=-1)
 
                self.prepos = prepos
                self.prepos_order = prepos_order