From: Klauer, Daniel Date: Tue, 5 Apr 2016 08:49:15 +0000 (+0000) Subject: persist_data: Return str instead of unicode for sqlite3 text queries X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09623a0811c613a47a01ae465b822d8156faca30;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git persist_data: Return str instead of unicode for sqlite3 text queries Python 2's sqlite3 module defaults to returning Unicode strings for SQL text queries, which could trickle down to other parts of bitbake code and cause unexpected Unicode conversions. Using byte strings avoids this issue. For example, the git fetcher's AUTOREV support caches HEAD SHA1's using bb.persist_data, so sometimes the git command strings passed to fetch2's runfetchcmd() were unicode, potentially causing UnicodeDecodeErrors when it appended the values of environment variables containing non-ASCII chars. [YOCTO #9382] Signed-off-by: Daniel Klauer Signed-off-by: Richard Purdie --- diff --git a/lib/bb/persist_data.py b/lib/bb/persist_data.py index 5795bc835bf..e45042324e7 100644 --- a/lib/bb/persist_data.py +++ b/lib/bb/persist_data.py @@ -201,6 +201,7 @@ class PersistData(object): def connect(database): connection = sqlite3.connect(database, timeout=5, isolation_level=None) connection.execute("pragma synchronous = off;") + connection.text_factory = str return connection def persist(domain, d):