summaryrefslogtreecommitdiff
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-01-20 14:58:00 +0000
committerRichard Purdie <richard@openedhand.com>2008-01-20 14:58:00 +0000
commit05c49eaac2d5bb58929b69cbd67dc4fe62cc8a6d (patch)
treedb5a425d9ecf576f2c364c4861dc9fc7355c8228 /bitbake/lib
parent079e6825aacec7ef9b3976c9057363b690a43ce5 (diff)
downloadopenembedded-core-05c49eaac2d5bb58929b69cbd67dc4fe62cc8a6d.tar.gz
openembedded-core-05c49eaac2d5bb58929b69cbd67dc4fe62cc8a6d.tar.bz2
openembedded-core-05c49eaac2d5bb58929b69cbd67dc4fe62cc8a6d.tar.xz
openembedded-core-05c49eaac2d5bb58929b69cbd67dc4fe62cc8a6d.zip
bitbake: Update to 1.8.10 release
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3555 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/__init__.py2
-rw-r--r--bitbake/lib/bb/fetch/git.py5
-rw-r--r--bitbake/lib/bb/persist_data.py6
3 files changed, 9 insertions, 4 deletions
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index 6179ef9a1..a126c1769 100644
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/lib/bb/__init__.py
@@ -21,7 +21,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-__version__ = "1.8.9"
+__version__ = "1.8.11"
__all__ = [
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py
index 9cc7f4e08..65ea5e5ca 100644
--- a/bitbake/lib/bb/fetch/git.py
+++ b/bitbake/lib/bb/fetch/git.py
@@ -131,8 +131,9 @@ class Git(Fetch):
return "git:" + ud.host + ud.path.replace('/', '.')
def _latest_revision(self, url, ud, d):
-
- bb.msg.note(1, bb.msg.domain.Fetcher, "Calling git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch ) )
+ """
+ Compute the HEAD revision for the url
+ """
output = runfetchcmd("git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d, True)
return output.split()[0]
diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py
index 0b88dadba..3103805ce 100644
--- a/bitbake/lib/bb/persist_data.py
+++ b/bitbake/lib/bb/persist_data.py
@@ -23,7 +23,11 @@ except ImportError:
try:
from pysqlite2 import dbapi2 as sqlite3
except ImportError:
- bb.msg.fatal(bb.msg.domain.PersistData, "Importing sqlite3 and pysqlite2 failed, please install one of them. A 'python-pysqlite2' like package is likely to be what you need.")
+ bb.msg.fatal(bb.msg.domain.PersistData, "Importing sqlite3 and pysqlite2 failed, please install one of them. Python 2.5 or a 'python-pysqlite2' like package is likely to be what you need.")
+
+sqlversion = sqlite3.sqlite_version_info
+if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3):
+ bb.msg.fatal(bb.msg.domain.PersistData, "sqlite3 version 3.3.0 or later is required.")
class PersistData:
"""