diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-04-11 17:03:55 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:33 +0100 |
commit | 1180bab54e2879401f3586c91a48174191a1ee8b (patch) | |
tree | a45aeee20eb5969cc1ac778fac47134929f4e021 /bitbake/lib/bb/persist_data.py | |
parent | 5b216c8000dbc3ed9f3e996242eb24269fcaf919 (diff) | |
download | poky-1180bab54e2879401f3586c91a48174191a1ee8b.tar.gz |
Apply some 2to3 transforms that don't cause issues in 2.6
(Bitbake rev: d39ab776e7ceaefc8361150151cf0892dcb70d9c)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/persist_data.py')
-rw-r--r-- | bitbake/lib/bb/persist_data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py index a26244510a..80ddeb5560 100644 --- a/bitbake/lib/bb/persist_data.py +++ b/bitbake/lib/bb/persist_data.py | |||
@@ -52,7 +52,7 @@ class PersistData: | |||
52 | except OSError: | 52 | except OSError: |
53 | bb.utils.mkdirhier(self.cachedir) | 53 | bb.utils.mkdirhier(self.cachedir) |
54 | 54 | ||
55 | self.cachefile = os.path.join(self.cachedir,"bb_persist_data.sqlite3") | 55 | self.cachefile = os.path.join(self.cachedir, "bb_persist_data.sqlite3") |
56 | bb.msg.debug(1, bb.msg.domain.PersistData, "Using '%s' as the persistent data cache" % self.cachefile) | 56 | bb.msg.debug(1, bb.msg.domain.PersistData, "Using '%s' as the persistent data cache" % self.cachefile) |
57 | 57 | ||
58 | self.connection = sqlite3.connect(self.cachefile, timeout=5, isolation_level=None) | 58 | self.connection = sqlite3.connect(self.cachefile, timeout=5, isolation_level=None) |
@@ -113,7 +113,7 @@ class PersistData: | |||
113 | try: | 113 | try: |
114 | self.connection.execute(*query) | 114 | self.connection.execute(*query) |
115 | return | 115 | return |
116 | except sqlite3.OperationalError, e: | 116 | except sqlite3.OperationalError as e: |
117 | if 'database is locked' in str(e): | 117 | if 'database is locked' in str(e): |
118 | continue | 118 | continue |
119 | raise | 119 | raise |