diff options
author | Richard Purdie <richard@openedhand.com> | 2008-01-20 14:58:00 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-01-20 14:58:00 +0000 |
commit | 05c49eaac2d5bb58929b69cbd67dc4fe62cc8a6d (patch) | |
tree | db5a425d9ecf576f2c364c4861dc9fc7355c8228 /bitbake/lib | |
parent | 079e6825aacec7ef9b3976c9057363b690a43ce5 (diff) | |
download | poky-05c49eaac2d5bb58929b69cbd67dc4fe62cc8a6d.tar.gz |
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__.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch/git.py | 5 | ||||
-rw-r--r-- | bitbake/lib/bb/persist_data.py | 6 |
3 files changed, 9 insertions, 4 deletions
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 | |||
28 | sqlversion = sqlite3.sqlite_version_info | ||
29 | if 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 | ||
28 | class PersistData: | 32 | class PersistData: |
29 | """ | 33 | """ |