launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad-buildd/snap-proxy-allow-repo into lp:launchpad-buildd.

Commit message:
buildsnap: Grant access to the proxy during the repo phase, allowing the base branch to be fetched from an external site.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/snap-proxy-allow-repo/+merge/312138
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad-buildd/snap-proxy-allow-repo into lp:launchpad-buildd.

=== modified file 'buildsnap'
--- buildsnap	2016-11-04 10:50:48 +0000
+++ buildsnap	2016-11-30 10:25:08 +0000
@@ -103,23 +103,25 @@
     def repo(self):
         """Collect git or bzr branch."""
         print("Running repo phase...")
+        env = {}
+        if self.options.proxy_url:
+            env["http_proxy"] = self.options.proxy_url
+            env["https_proxy"] = self.options.proxy_url
         if self.options.branch is not None:
             self.run_build_command(['ls', '/build'])
             cmd = ["bzr", "branch", self.options.branch, self.name]
             if not self.ssl_verify:
                 cmd.insert(1, "-Ossl.cert_reqs=none")
-            self.run_build_command(cmd)
         else:
             assert self.options.git_repository is not None
             assert self.options.git_path is not None
-            if not self.ssl_verify:
-                env = {"GIT_SSL_NO_VERIFY": "1"}
-            else:
-                env = None
-            self.run_build_command([
+            cmd = [
                 "git", "clone", "-b", self.options.git_path,
-                self.options.git_repository, self.name],
-                env=env)
+                self.options.git_repository, self.name,
+                ]
+            if not self.ssl_verify:
+                env["GIT_SSL_NO_VERIFY"] = "1"
+        self.run_build_command(cmd, env=env)
 
     def pull(self):
         """Run pull phase."""

=== modified file 'debian/changelog'
--- debian/changelog	2016-11-30 10:20:32 +0000
+++ debian/changelog	2016-11-30 10:25:08 +0000
@@ -2,6 +2,8 @@
 
   * buildsnap: Grant access to the proxy during the build phase as well as
     during the pull phase (LP: #1642281).
+  * buildsnap: Grant access to the proxy during the repo phase, allowing the
+    base branch to be fetched from an external site.
 
  -- Colin Watson <cjwatson@xxxxxxxxxx>  Fri, 04 Nov 2016 10:47:41 +0000