diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-09 04:19:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-09 04:19:22 +0000 |
| commit | 672d3fdd899af17b28ab6d92477d921801bb23af (patch) | |
| tree | fdc42df967d11ba7350f8911aca233c33f2a3832 /pym/portage.py | |
| parent | e3dce69dd238a194ebbd6426a5584f91968bdcac (diff) | |
| download | portage-672d3fdd899af17b28ab6d92477d921801bb23af.tar.gz portage-672d3fdd899af17b28ab6d92477d921801bb23af.tar.bz2 portage-672d3fdd899af17b28ab6d92477d921801bb23af.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. (trunk r10264)
svn path=/main/branches/2.1.2/; revision=10265
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index 4bb4cbca6..2ee750e52 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -9311,7 +9311,11 @@ class dblink: return 1 # 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 = [] if True: |