From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 3 Feb 2007 23:49:22 +0000 (-0000)
Subject: Fix "UnboundLocalError: local variable 'portage' referenced before assignment" caused... 
X-Git-Tag: v2.2_pre1~1755
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e15a8797cc4f159b74c4ba0485b70faeeab5c747;p=portage.git

Fix "UnboundLocalError: local variable 'portage' referenced before assignment" caused by a local import hiding a global import.

svn path=/main/trunk/; revision=5887
---

diff --git a/bin/emerge b/bin/emerge
index d33fa0615..23ab1bb59 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4081,9 +4081,9 @@ def action_metadata(settings, portdb, myopts):
 	cm = settings.load_best_module("portdbapi.metadbmodule")(
 		myportdir, "metadata/cache", portage.auxdbkeys[:])
 
-	import portage.cache.util
+	from portage.cache import util
 
-	class percentage_noise_maker(portage.cache.util.quiet_mirroring):
+	class percentage_noise_maker(util.quiet_mirroring):
 		def __init__(self, dbapi):
 			self.dbapi = dbapi
 			self.cp_all = dbapi.cp_all()