[bitbake-devel] fetch2/git: Add sanity check to ensure we really did fetch the correct revisions

Submitted by Richard Purdie on Dec. 5, 2013, 3:21 p.m. | Patch ID: 62917


Message ID 1386256898.25847.22.camel@ted
State New
Headers show

Commit Message

Richard Purdie Dec. 5, 2013, 3:21 p.m.
The fetcher made the rather bold assumption that if it fetched from the upstream,
the revisions were present and correct. These checks are fast and ensure that
really is the case. The avoids accidental network accessed and missing
branch configuration problems.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Patch hide | download patch | download mbox

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index a9470e4..2b9f8af 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -213,6 +213,9 @@  class Git(FetchMethod):
             runfetchcmd("%s prune-packed" % ud.basecmd, d)
             runfetchcmd("%s pack-redundant --all | xargs -r rm" % ud.basecmd, d)
             ud.repochanged = True
+        for name in ud.names:
+            if not self._contains_ref(ud.revisions[name], ud.branches[name], d):
+                raise bb.fetch2.FetchError("Unable to find revision %s in branch %s even from upstream" % (ud.revisions[name], ud.branches[name]))
     def build_mirror_data(self, ud, d):
         # Generate a mirror tarball if needed