diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-24 03:40:23 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-24 03:40:23 -0700 |
| commit | 74b175712db188b4642c159a4ac1d6d84faba354 (patch) | |
| tree | 4dccfef08c349f3358c5d4407fe25c26ca09c656 /pym | |
| parent | e5e2368544098b999ae60412c70f96dab3ad9d4c (diff) | |
| download | portage-74b175712db188b4642c159a4ac1d6d84faba354.tar.gz portage-74b175712db188b4642c159a4ac1d6d84faba354.tar.bz2 portage-74b175712db188b4642c159a4ac1d6d84faba354.zip | |
treewalk: fix PORTAGE_BUILDIR_LOCKED state
This fixes breakage from commit
f0f1bbe8fa9d3f698cbe529d2a11eec1ce437119.
Diffstat (limited to 'pym')
| -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 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)) |