summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/ChangeLog2
-rwxr-xr-xbitbake/bin/bitbake2
-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
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 @@
1Changes in BitBake 1.8.x: 1Changes in BitBake 1.8.10:
2 - Psyco is available only for x86 - do not use it on other architectures. 2 - Psyco is available only for x86 - do not use it on other architectures.
3 - Fix a bug in bb.decodeurl where http://some.where.com/somefile.tgz decoded to host="" (#1530) 3 - Fix a bug in bb.decodeurl where http://some.where.com/somefile.tgz decoded to host="" (#1530)
4 - Warn about malformed PREFERRED_PROVIDERS (#1072) 4 - 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
27import bb 27import bb
28from bb import cooker 28from bb import cooker
29 29
30__version__ = "1.8.9" 30__version__ = "1.8.11"
31 31
32#============================================================================# 32#============================================================================#
33# BBOptions 33# 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 @@
21# with this program; if not, write to the Free Software Foundation, Inc., 21# with this program; if not, write to the Free Software Foundation, Inc.,
22# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 22# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
23 23
24__version__ = "1.8.9" 24__version__ = "1.8.11"
25 25
26__all__ = [ 26__all__ = [
27 27
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):
131 return "git:" + ud.host + ud.path.replace('/', '.') 131 return "git:" + ud.host + ud.path.replace('/', '.')
132 132
133 def _latest_revision(self, url, ud, d): 133 def _latest_revision(self, url, ud, d):
134 134 """
135 bb.msg.note(1, bb.msg.domain.Fetcher, "Calling git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch ) ) 135 Compute the HEAD revision for the url
136 """
136 output = runfetchcmd("git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d, True) 137 output = runfetchcmd("git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d, True)
137 return output.split()[0] 138 return output.split()[0]
138 139
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:
23 try: 23 try:
24 from pysqlite2 import dbapi2 as sqlite3 24 from pysqlite2 import dbapi2 as sqlite3
25 except ImportError: 25 except ImportError:
26 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.") 26 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.")
27
28sqlversion = sqlite3.sqlite_version_info
29if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3):
30 bb.msg.fatal(bb.msg.domain.PersistData, "sqlite3 version 3.3.0 or later is required.")
27 31
28class PersistData: 32class PersistData:
29 """ 33 """