From 94ea294e4b07a4f9cb5814a205510a899d1c106a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 29 Nov 2007 09:06:52 +0000 Subject: When portage reinstalls itself, pre-load elog modules in dblink.merge() since we won't be able to later if they get unmerged (happens when namespace changes). svn path=/main/trunk/; revision=8749 --- pym/portage/elog/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pym/portage/elog') diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py index e1df6d9bd..c68fedca0 100644 --- a/pym/portage/elog/__init__.py +++ b/pym/portage/elog/__init__.py @@ -42,6 +42,7 @@ def _combine_logentries(logentries): rValue.append("\n") return "".join(rValue) +_elog_mod_imports = {} _elog_atexit_handlers = [] _preserve_logentries = {} def elog_process(cpv, mysettings, phasefilter=None): @@ -94,9 +95,12 @@ def elog_process(cpv, mysettings, phasefilter=None): # FIXME: ugly ad.hoc import code # TODO: implement a common portage module loader name = "portage.elog.mod_" + s - m = __import__(name) - for comp in name.split(".")[1:]: - m = getattr(m, comp) + m = _elog_mod_imports.get(name) + if m is None: + m = __import__(name) + for comp in name.split(".")[1:]: + m = getattr(m, comp) + _elog_mod_imports[name] = m def timeout_handler(signum, frame): raise PortageException("Timeout in elog_process for system '%s'" % s) import signal -- cgit v1.2.3-1-g7c22