From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 1 Mar 2010 04:38:47 +0000 (-0000)
Subject: Remove redundant local elog_process import that can trigger UnboundLocalError
X-Git-Tag: v2.2_rc64~19
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bf88bd49d3cc2c8f43edcd06d1464ab79caab4cc;p=portage.git

Remove redundant local elog_process import that can trigger UnboundLocalError
in some cases.

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

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index ecb0e32ce..218e1bc7f 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -994,7 +994,6 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 				# The merge phase handles this already.  Callers don't know how
 				# far this function got, so we have to call elog_process() here
 				# so that it's only called once.
-				from portage.elog import elog_process
 				elog_process(mysettings.mycpv, mysettings)
 			if retval == os.EX_OK:
 				retval = merge(mysettings["CATEGORY"], mysettings["PF"],