Merge lp:~cjwatson/launchpad-buildd/fix-https-proxy into lp:launchpad-buildd

[Colin Watson]

buildsnap: Set https_proxy to an http:// URL rather than https://; the former is more accurate anyway and the latter breaks npm (LP: #1588870).

buildsnap: Set https_proxy to an http:// URL rather than https://; the former is more accurate anyway and the latter breaks npm (LP: #1588870).

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'buildsnap'
--- buildsnap	2016-08-08 10:02:43 +0000
+++ buildsnap	2016-09-16 10:45:51 +0000
@@ -127,8 +127,7 @@
         env = {"SNAPCRAFT_LOCAL_SOURCES": "1"}
         if self.options.proxy_url:
             env["http_proxy"] = self.options.proxy_url
-            https_url = self.options.proxy_url.replace('http://', 'https://')
-            env["https_proxy"] = https_url
+            env["https_proxy"] = self.options.proxy_url
         self.run_build_command(
             ["snapcraft", "pull"],
             path=os.path.join("/build", self.name),

=== modified file 'debian/changelog'
--- debian/changelog	2016-08-08 10:02:43 +0000
+++ debian/changelog	2016-09-16 10:45:51 +0000
@@ -2,6 +2,8 @@
 
   * buildsnap: Catch urllib2.URLError as well as urllib2.HTTPError when
     trying to revoke the proxy token (LP: #1610916).
+  * buildsnap: Set https_proxy to an http:// URL rather than https://; the
+    former is more accurate anyway and the latter breaks npm (LP: #1588870).
 
  -- Colin Watson <[e-mail]>  Thu, 07 Jul 2016 11:07:49 +0100