From 74b175712db188b4642c159a4ac1d6d84faba354 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 24 May 2011 03:40:23 -0700 Subject: treewalk: fix PORTAGE_BUILDIR_LOCKED state This fixes breakage from commit f0f1bbe8fa9d3f698cbe529d2a11eec1ce437119. --- pym/portage/dbapi/vartree.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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)) -- cgit v1.2.3-1-g7c22