Avoid another unbounded error by not importing portage.* somewhere in

the function such that "portage" as variable doesn't get overridden.

svn path=/main/branches/prefix/; revision=5886

diff --git a/bin/emerge b/bin/emerge
index 0b7ef032887966c6dcd324ade0e135f769617274..cb9b89b20d3a8a49b15b0abeb2ce820442c4abe6 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -45,6 +45,7 @@ import portage.dep
 import portage.util
 import portage.locks
 import portage.exception
+import portage.cache.util
 from portage.const import EPREFIX
 from portage.data import secpass
 from portage.util import normalize_path as normpath
@@ -4128,8 +4129,6 @@ def action_metadata(settings, portdb, myopts):
        cm = settings.load_best_module("portdbapi.metadbmodule")(
                myportdir, "metadata/cache", portage.auxdbkeys[:])
 
-       import portage.cache.util
-
        class percentage_noise_maker(portage.cache.util.quiet_mirroring):
                def __init__(self, dbapi):
                        self.dbapi = dbapi