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 6e92c9e3803b4e086fa8d2ac26f8944f3c043c2c..8fd5f5501af869bf224503bc24bc0a8bcd1707cc 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2996,8 +2996,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))