diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-24 03:40:23 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-25 21:31:06 -0700 |
| commit | d3713109698009ad5b0bfd951073ee70b88808b2 (patch) | |
| tree | 4609b4be9a17d2bda5293e169463710fe733747f | |
| parent | 36337a64cb3b254ad69482ed4e955d83dd965e22 (diff) | |
| download | portage-d3713109698009ad5b0bfd951073ee70b88808b2.tar.gz portage-d3713109698009ad5b0bfd951073ee70b88808b2.tar.bz2 portage-d3713109698009ad5b0bfd951073ee70b88808b2.zip | |
treewalk: fix PORTAGE_BUILDIR_LOCKED state
This fixes breakage from commit
f0f1bbe8fa9d3f698cbe529d2a11eec1ce437119.
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 6e92c9e38..8fd5f5501 100644 --- 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)) |