From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 24 May 2011 10:40:23 +0000 (-0700)
Subject: treewalk: fix PORTAGE_BUILDIR_LOCKED state
X-Git-Tag: v2.2.0_alpha36~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=74b175712db188b4642c159a4ac1d6d84faba354;p=portage.git

treewalk: fix PORTAGE_BUILDIR_LOCKED state

This fixes breakage from commit
f0f1bbe8fa9d3f698cbe529d2a11eec1ce437119.
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index a9d2d147c..5aec973eb 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3063,8 +3063,10 @@ class dblink(object):
 		for cur_cpv in slot_matches:
 			# Clone the config in case one of these has to be unmerged since
 			# we need it to have private ${T} etc... for things like elog.
+			settings_clone = config(clone=self.settings)
+			settings_clone.pop("PORTAGE_BUILDIR_LOCKED", None)
 			others_in_slot.append(dblink(self.cat, catsplit(cur_cpv)[1],
-				settings=config(clone=self.settings),
+				settings=settings_clone,
 				vartree=self.vartree, treetype="vartree",
 				scheduler=self._scheduler, pipe=self._pipe))