Ubuntu Pastebin

Paste from ogra at Wed, 24 Aug 2016 18:18:21 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
diff --git a/debian/changelog b/debian/changelog
index fe5c5df..5e12829 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+snapcraft (2.15.1+ppa3) xenial; urgency=medium
+
+  * forcefully unset http_proxy and https_proxy for bzr branches to work
+    around (LP: #1606203)
+  * comment out forceful addition of obsolete kernel keys in
+    snapcraft/internal/meta.py
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 23 Aug 2016 17:52:59 +0200
+
 snapcraft (2.15.1) xenial; urgency=medium
 
   [ Robert Ancell ]
diff --git a/snapcraft/internal/meta.py b/snapcraft/internal/meta.py
index 28baa26..2afd103 100644
--- a/snapcraft/internal/meta.py
+++ b/snapcraft/internal/meta.py
@@ -163,8 +163,8 @@ class _SnapPackaging:
         if 'apps' in self._config_data:
             snap_yaml['apps'] = self._wrap_apps(self._config_data['apps'])
 
-        if self._config_data.get('type', '') == 'kernel':
-            snap_yaml.update(self._get_kernel_keys())
+        #if self._config_data.get('type', '') == 'kernel':
+        #    snap_yaml.update(self._get_kernel_keys())
 
         return snap_yaml
 
diff --git a/snapcraft/internal/sources.py b/snapcraft/internal/sources.py
index b6ee2d6..9a2171d 100644
--- a/snapcraft/internal/sources.py
+++ b/snapcraft/internal/sources.py
@@ -138,6 +138,8 @@ class Bazaar(Base):
 
     def pull(self):
         tag_opts = []
+        os.environ['http_proxy'] = ""
+        os.environ['https_proxy'] = ""
         if self.source_tag:
             tag_opts = ['-r', 'tag:' + self.source_tag]
         if os.path.exists(os.path.join(self.source_dir, '.bzr')):
Download as text