From 672d3fdd899af17b28ab6d92477d921801bb23af Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 9 May 2008 04:19:22 +0000
Subject: 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
---
 pym/portage.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'pym')

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:
-- 
cgit v1.2.3-1-g7c22