From 05c49eaac2d5bb58929b69cbd67dc4fe62cc8a6d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 20 Jan 2008 14:58:00 +0000 Subject: bitbake: Update to 1.8.10 release git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3555 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake/ChangeLog | 2 +- bitbake/bin/bitbake | 2 +- bitbake/lib/bb/__init__.py | 2 +- bitbake/lib/bb/fetch/git.py | 5 +++-- bitbake/lib/bb/persist_data.py | 6 +++++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog index 8f251475aa..72ef22d610 100644 --- a/bitbake/ChangeLog +++ b/bitbake/ChangeLog @@ -1,4 +1,4 @@ -Changes in BitBake 1.8.x: +Changes in BitBake 1.8.10: - Psyco is available only for x86 - do not use it on other architectures. - Fix a bug in bb.decodeurl where http://some.where.com/somefile.tgz decoded to host="" (#1530) - Warn about malformed PREFERRED_PROVIDERS (#1072) diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index 384175d852..4492bf045b 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -27,7 +27,7 @@ sys.path.insert(0,os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'l import bb from bb import cooker -__version__ = "1.8.9" +__version__ = "1.8.11" #============================================================================# # BBOptions diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py index 6179ef9a1c..a126c17693 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 9cc7f4e086..65ea5e5cad 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 0b88dadba5..3103805ce1 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: """ -- cgit v1.2.3-54-g00ecf