diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-10 16:00:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-11 00:07:08 +0100 |
commit | 82da1e6f6c4f2eee87ec5f100ad6d65b2b6372dc (patch) | |
tree | b584df5f9b795c837f128553d2ae830457258400 /bitbake/lib | |
parent | 12c8a50c60fc0cc3f9f2ed43d461ee2ac79c0e99 (diff) | |
download | poky-82da1e6f6c4f2eee87ec5f100ad6d65b2b6372dc.tar.gz |
bitbake: persist_data: Fix py3 update stack overflow
Revision d0f904d407f57998419bd9c305ce53e5eaa36b24 accidentally broke
items() and values() and made them cause stack overflows. Undo that
breakage.
(Bitbake rev: 88c5beca705efa7df4a96fb2aaf3f13c336ac328)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-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 403f3a541e..bb6deca526 100644 --- a/bitbake/lib/bb/persist_data.py +++ b/bitbake/lib/bb/persist_data.py | |||
@@ -131,14 +131,14 @@ class SQLTable(collections.MutableMapping): | |||
131 | return [row[1] for row in data] | 131 | return [row[1] for row in data] |
132 | 132 | ||
133 | def values(self): | 133 | def values(self): |
134 | return list(self.values()) | 134 | return list(self.itervalues()) |
135 | 135 | ||
136 | def itervalues(self): | 136 | def itervalues(self): |
137 | data = self._execute("SELECT value FROM %s;" % self.table) | 137 | data = self._execute("SELECT value FROM %s;" % self.table) |
138 | return (row[0] for row in data) | 138 | return (row[0] for row in data) |
139 | 139 | ||
140 | def items(self): | 140 | def items(self): |
141 | return list(self.items()) | 141 | return list(self.iteritems()) |
142 | 142 | ||
143 | def iteritems(self): | 143 | def iteritems(self): |
144 | return self._execute("SELECT * FROM %s;" % self.table) | 144 | return self._execute("SELECT * FROM %s;" % self.table) |