Make more code conditional on existence of PORTAGE_BUILDDIR inside

dblink._merge(). (trunk r14955)

svn path=/main/branches/2.1.7/; revision=14956

1 files changed, 16 insertions, 15 deletions

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 9793514a0..b228aeddf 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3263,22 +3263,23 @@ class dblink(object):
 					self._scheduler.dblinkEbuildPhase(
 						self, mydbapi, myebuild, phase)
 
-			# Process ebuild logfiles
-			elog_process(self.mycpv, self.settings, phasefilter=filter_mergephases)
-			if 'noclean' not in self.settings.features and \
-				(retval == os.EX_OK or \
-				('fail-clean' in self.settings.features and \
-				os.path.isdir(self.settings['PORTAGE_BUILDDIR']))):
-				if myebuild is None:
-					myebuild = os.path.join(inforoot, self.pkg + ".ebuild")
+				elog_process(self.mycpv, self.settings,
+					phasefilter=filter_mergephases)
+
+				if 'noclean' not in self.settings.features and \
+					(retval == os.EX_OK or \
+					'fail-clean' in self.settings.features):
+					if myebuild is None:
+						myebuild = os.path.join(inforoot, self.pkg + ".ebuild")
+
+					if self._scheduler is None:
+						doebuild(myebuild, "clean", myroot,
+							self.settings, tree=self.treetype,
+							mydbapi=mydbapi, vartree=self.vartree)
+					else:
+						self._scheduler.dblinkEbuildPhase(
+							self, mydbapi, myebuild, "clean")
 
-				if self._scheduler is None:
-					doebuild(myebuild, "clean", myroot,
-						self.settings, tree=self.treetype,
-						mydbapi=mydbapi, vartree=self.vartree)
-				else:
-					self._scheduler.dblinkEbuildPhase(
-						self, mydbapi, myebuild, "clean")
 		finally:
 			self.unlockdb()
 			self.vartree.dbapi._bump_mtime(self.mycpv)