summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-08 09:27:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-08 12:05:35 +0000
commit5920e85c561624e657c126df58f5c378a8950bbc (patch)
tree158cb8960ecaf4f1fe21af37c8648c9fb955e3c4
parent1544aa8ab4a80d529a001e27b473645f2caec87c (diff)
downloadopenembedded-core-5920e85c561624e657c126df58f5c378a8950bbc.tar.gz
openembedded-core-5920e85c561624e657c126df58f5c378a8950bbc.tar.bz2
openembedded-core-5920e85c561624e657c126df58f5c378a8950bbc.tar.xz
openembedded-core-5920e85c561624e657c126df58f5c378a8950bbc.zip
bitbake/fetch2/git: Ensure unresolved branches are translated into revisions
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/git.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 6bcc4a483..f05a360f1 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -72,7 +72,8 @@ class Git(FetchMethod):
ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
for name in ud.names:
- if not ud.revisions[name] or ud.revisions[name] == "master":
+ # Ensure anything that doesn't look like a sha256 checksum/revision is translated into one
+ if not ud.revisions[name] or len(ud.revisions[name]) != 40 or (False in [c in "abcdef0123456789" for c in ud.revisions[name]]):
ud.revisions[name] = self.latest_revision(url, ud, d, name)
ud.localfile = ud.clonedir