Add a _preload_elog_modules() function.

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 3b845226c0c5aed403ba8c0a7859d430179f12c3..afdb339cb33a02bd717589d517f27253fa244d6c 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -12,7 +12,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
        'portage.dbapi.dep_expand:dep_expand',
        'portage.dep:dep_getkey,isjustname,match_from_list,' + \
                'use_reduce,_slot_re',
-       'portage.elog:elog_process',
+       'portage.elog:elog_process,_preload_elog_modules',
        'portage.locks:lockdir,unlockdir',
        'portage.output:bold,colorize',
        'portage.package.ebuild.doebuild:doebuild_environment,' + \
@@ -3825,7 +3825,7 @@ class dblink(object):
                                os.chmod(var_new, dir_perms)
                        os.chmod(base_path_tmp, dir_perms)
                        # This serves so pre-load the modules.
-                       elog_process(self.mycpv, self.settings)
+                       _preload_elog_modules()
 
                return self._merge(mergeroot, inforoot,
                                myebuild=myebuild, cleanup=cleanup,

diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py
index 78b6d83983941e5bb1da12c47a24b96ad4f6b500..6bb52d0656a7f0cdeb1e5800a351b516e0e9a8c9 100644 (file)
--- a/pym/portage/elog/__init__.py
+++ b/pym/portage/elog/__init__.py
@@ -15,6 +15,20 @@ from portage.elog.filtering import filter_loglevels
 from portage.localization import _
 from portage import os
 
+def _preload_elog_modules(settings):
+       logsystems = settings.get("PORTAGE_ELOG_SYSTEM", "").split()
+       for s in logsystems:
+               # allow per module overrides of PORTAGE_ELOG_CLASSES
+               if ":" in s:
+                       s, levels = s.split(":", 1)
+                       levels = levels.split(",")
+               # - is nicer than _ for module names, so allow people to use it.
+               s = s.replace("-", "_")
+               try:
+                       _load_mod("portage.elog.mod_" + s)
+               except ImportError:
+                       pass
+
 def _merge_logentries(a, b):
        rValue = {}
        phases = set(a)