summaryrefslogtreecommitdiffstats
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-10 23:37:14 +0000
commit0a8e4172ffdfd9e93dd697059b82d683a48facae (patch)
tree9804a38015244b98e920d589dde284ca140b9a13
parent5f0d6b75a0aa2ca5fc212d9fb34554fcf7486639 (diff)
downloadbitbake-0a8e4172ffdfd9e93dd697059b82d683a48facae.tar.gz
bitbake/fetch2/git: Ensure unresolved branches are translated into revisions
(From Poky rev: 5920e85c561624e657c126df58f5c378a8950bbc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/fetch2/git.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index 6bcc4a483..f05a360f1 100644
--- a/lib/bb/fetch2/git.py
+++ b/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