Don't use LazyLoad for cache pulls because it causes a race condition.

svn path=/main/trunk/; revision=4503

diff --git a/pym/cache/sqlite.py b/pym/cache/sqlite.py
index 40b0b9a9e63c53559ccd88e5f611d8f3806910ff..571eff39b9509a386fb095bd8dd72e4df0616dda 100644 (file)
--- a/pym/cache/sqlite.py
+++ b/pym/cache/sqlite.py
@@ -4,8 +4,7 @@
 
 from cache import fs_template
 from cache import cache_errors
-import errno, os, stat
-from cache.mappings import LazyLoad, ProtectedDict
+import os
 from cache.template import reconstruct_eclasses
 from portage_util import writemsg, apply_secpass_permissions
 from portage_data import portage_gid
@@ -138,15 +137,6 @@ class database(fs_template.FsBased):
                        raise cache_errors.InitializationError(self.__class__,"actual synchronous = "+actual_synchronous+" does does not match requested value of "+synchronous)
 
        def __getitem__(self, cpv):
-               if not self.has_key(cpv):
-                       raise KeyError(cpv)
-               def curry(*args):
-                       def callit(*args2):
-                               return args[0](*args[1:]+args2)
-                       return callit
-               return ProtectedDict(LazyLoad(curry(self._pull, cpv)))
-
-       def _pull(self, cpv):
                cursor = self._db_cursor
                cursor.execute("select * from %s where %s=%s" % \
                        (self._db_table["packages"]["table_name"],