sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: git: Use merge-base instead of log for testing if a commit is present 

The current use of git log to check if a given revision is present can be
a little fragile.

For example if revision X was on branch A, and then later added to branch
B, the update checks would not notice this since they just check for X
being in the repository.

We also had some autobuilder corruption where an older packed-refs file
was copied over a new repository containing newer pack files. There
was no update to the refs file since the revision was present but
not accessible in any branch.

The correct fix is to check that the required revisions are present
on the specific branches. This patch does this using merge-base.

(Bitbake rev: 89abfbc1953e3711d6c90aff793ee622c22609b1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2013-11-18 17:17:16 +00:00
parent e45d7355f1
commit 2354250a95
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bitbake/lib/bb/fetch2/git.py
View File

@ -150,7 +150,7 @@ class Git(FetchMethod):
return True
os.chdir(ud.clonedir)
for name in ud.names:
if not self._contains_ref(ud.revisions[name], d):
if not self._contains_ref(ud.revisions[name], ud.branches[name], d):
return True
if ud.write_tarballs and not os.path.exists(ud.fullmirror):
return True
@ -197,7 +197,7 @@ class Git(FetchMethod):
# Update the checkout if needed
needupdate = False
for name in ud.names:
if not self._contains_ref(ud.revisions[name], d):
if not self._contains_ref(ud.revisions[name], ud.branches[name], d):
needupdate = True
if needupdate:
try:
@ -281,13 +281,14 @@ class Git(FetchMethod):
def supports_srcrev(self):
return True
def _contains_ref(self, tag, d):
def _contains_ref(self, tag, branch, d):
basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
cmd = "%s log --pretty=oneline -n 1 %s -- 2> /dev/null | wc -l" % (basecmd, tag)
output = runfetchcmd(cmd, d, quiet=True)
if len(output.split()) > 1:
raise bb.fetch2.FetchError("The command '%s' gave output with more then 1 line unexpectedly, output: '%s'" % (cmd, output))
return output.split()[0] != "0"
cmd = "%s merge-base --is-ancestorlog %s %s" % (basecmd, tag, branch)
try:
output = runfetchcmd(cmd, d, quiet=True)
except bb.fetch2.FetchError:
return False
return True
def _revision_key(self, url, ud, d, name):
"""