Merge lp:~cjwatson/launchpad-buildd/snap-submodules into lp:launchpad-buildd

[Colin Watson]

buildsnap: Initialise git submodules (LP: #1694413).

[William Grant (wgrant)]

This sounds like it will cause currently successful builds to fail if their repos happen to include submodules that aren't accessible. I wonder if we want to "git submodule update --init --recursive" as a separate step afterwards, and not consider its failure to be fatal?

review: Approve

[lp:~cjwatson/launchpad-buildd/snap-submodules]

225. By Colin Watson on 2017-07-17

Tolerate failures when fetching git submodules.

[Colin Watson (cjwatson)]

Seems reasonable. Done.

=== modified file 'buildsnap'
--- buildsnap	2017-05-15 16:57:31 +0000
+++ buildsnap	2017-07-17 21:09:48 +0000
@@ -150,6 +150,16 @@
             if not self.ssl_verify:
                 env["GIT_SSL_NO_VERIFY"] = "1"
         self.run_build_command(cmd, env=env)
+        if self.options.git_repository is not None:
+            try:
+                self.run_build_command(
+                    ["git", "-C", self.name,
+                     "submodule", "update", "--init", "--recursive"],
+                    env=env)
+            except subprocess.CalledProcessError as e:
+                print(
+                    "'git submodule update --init --recursive failed with "
+                    "exit code %s (build may fail later)" % e.returncode)
         status = {}
         if self.options.branch is not None:
             status["revision_id"] = self.run_build_command(

=== modified file 'debian/changelog'
--- debian/changelog	2017-07-03 14:04:31 +0000
+++ debian/changelog	2017-07-17 21:09:48 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 launchpad-buildd (145) xenial; urgency=medium
 
   * buildrecipe: Explicitly mark the local apt archive as trusted
@@ -5,6 +6,14 @@
 
  -- Colin Watson <[e-mail]>  Mon, 03 Jul 2017 15:03:51 +0100
 
+=======
+launchpad-buildd (145) UNRELEASED; urgency=medium
+
+  * buildsnap: Initialise git submodules (LP: #1694413).
+
+ -- Colin Watson <[e-mail]>  Wed, 31 May 2017 11:19:36 +0100
+
+>>>>>>> MERGE-SOURCE
 launchpad-buildd (144) xenial; urgency=medium
 
   * buildsnap: Fix revision_id computation to handle the case where