persist_data: resurrect the lock wait for selects

Think this got inadvertantly dropped when switching to the new API.

(Bitbake rev: 628c5159d1151b89f2b7210c8819489e8dc9a84d)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py
index 4f87c37f2bb95b4f32ff84f5f6ea9fcbd35e652a..b8c2392945eae819a597deca3ffdda520d8b3702 100644 (file)
--- a/bitbake/lib/bb/persist_data.py
+++ b/bitbake/lib/bb/persist_data.py
@@ -64,8 +64,8 @@ class SQLTable(collections.MutableMapping):
                 raise
 
     def __getitem__(self, key):
-        data = self.cursor.execute("SELECT * from %s where key=?;" %
-                                   self.table, [key])
+        data = self._execute("SELECT * from %s where key=?;" %
+                             self.table, [key])
         for row in data:
             return row[1]
 
@@ -73,7 +73,7 @@ class SQLTable(collections.MutableMapping):
         self._execute("DELETE from %s where key=?;" % self.table, [key])
 
     def __setitem__(self, key, value):
-        data = self.cursor.execute("SELECT * from %s where key=?;" %
+        data = self._execute("SELECT * from %s where key=?;" %
                                    self.table, [key])
         exists = len(list(data))
         if exists:
@@ -87,22 +87,22 @@ class SQLTable(collections.MutableMapping):
         return key in set(self)
 
     def __len__(self):
-        data = self.cursor.execute("SELECT COUNT(key) FROM %s;" % self.table)
+        data = self._execute("SELECT COUNT(key) FROM %s;" % self.table)
         for row in data:
             return row[0]
 
     def __iter__(self):
-        data = self.cursor.execute("SELECT key FROM %s;" % self.table)
+        data = self._execute("SELECT key FROM %s;" % self.table)
         for row in data:
             yield row[0]
 
     def iteritems(self):
-        data = self.cursor.execute("SELECT * FROM %s;" % self.table)
+        data = self._execute("SELECT * FROM %s;" % self.table)
         for row in data:
             yield row[0], row[1]
 
     def itervalues(self):
-        data = self.cursor.execute("SELECT value FROM %s;" % self.table)
+        data = self._execute("SELECT value FROM %s;" % self.table)
         for row in data:
             yield row[0]