From 478677fb624ff6093004a43a2cb9f9ce35cb4e1b Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Thu, 23 Dec 2010 10:36:39 -0700
Subject: 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>
---
bitbake/lib/bb/persist_data.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'bitbake')
diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py
index 4f87c37f2..b8c239294 100644
--- 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]
--
cgit v1.2.3