diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-09 04:17:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-09 04:17:57 +0000 |
| commit | b45870791561cc40c86e1e2d86911c6c1ca1fe3a (patch) | |
| tree | 6ea53dd12a297a6ef1ba92f8f5a408a4224d381d /pym/portage | |
| parent | d69b84db1e14cb16e1f038636120c73bab56e45a (diff) | |
| download | portage-b45870791561cc40c86e1e2d86911c6c1ca1fe3a.tar.gz portage-b45870791561cc40c86e1e2d86911c6c1ca1fe3a.tar.bz2 portage-b45870791561cc40c86e1e2d86911c6c1ca1fe3a.zip | |
For the "blockers" parameter that's passed into the dblink constructor
now, make it a callable since it really shouldn't be called until the
vdb lock has been acquired.
svn path=/main/trunk/; revision=10264
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index e04f861b5..a150f4a00 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2083,7 +2083,11 @@ class dblink(object): self._preserve_libs(srcroot, destroot, myfilelist+mylinklist, counter, inforoot) # check for package collisions - blockers = self._blockers + blockers = None + if self._blockers is not None: + # This is only supposed to be called when + # the vdb is locked, like it is here. + blockers = self._blockers() if blockers is None: blockers = [] collisions = self._collision_protect(srcroot, destroot, |