Merge lp:~sergiusens/phablet-tools/1225910 into lp:phablet-tools

[Sergio Schvezov]

phablet-flash: added proxy support.

Limited testing with a basic tinyproxy and export http_proxy and https_proxy. I used --debug to see the http GETs go through the proxy.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/168

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/phablet-tools-ci/224/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

untested, but looks good

review: Approve

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Fails when tested against my squid proxy server on 12.04.

review: Needs Fixing

Unmerged revisions

211. By Sergio Schvezov on 2013-10-22

Adding proxy support

=== modified file 'phabletutils/cdimage.py'
--- phabletutils/cdimage.py	2013-08-22 22:25:37 +0000
+++ phabletutils/cdimage.py	2013-10-22 17:32:05 +0000
@@ -16,11 +16,11 @@
 
 import logging
 import re
-import requests
 import os.path
 import subprocess
 import urlparse
 
+from phabletutils import downloads
 from phabletutils import hashes
 from phabletutils import fileutils
 from phabletutils import resources
@@ -31,7 +31,7 @@
 
 def _get_elements(uri):
     '''Scraps cdimage and returns a list of relevant links as elements.'''
-    request = requests.get(uri).content
+    request = downloads.get_content(uri)
     html_elements = filter(
         lambda x: '<li><a href=' in x and
         'Parent Directory' not in x and

=== modified file 'phabletutils/downloads.py'
--- phabletutils/downloads.py	2013-10-15 19:31:19 +0000
+++ phabletutils/downloads.py	2013-10-22 17:32:05 +0000
@@ -22,6 +22,7 @@
 import os
 import requests
 import subprocess
+import urllib
 
 from xdg.BaseDirectory import xdg_config_home
 
@@ -132,7 +133,7 @@
 
 def get_content(uri):
     '''Fetches the SHA256 sum file from cdimage.'''
-    content_request = requests.get(uri)
+    content_request = requests.get(uri, proxies=urllib.getproxies())
     if content_request.status_code != 200:
         return None
     else:
@@ -142,9 +143,11 @@
 def get_ubuntu_stamp(uri):
     '''Downloads the jenkins build id from stamp file'''
     try:
-        ubuntu_stamp = requests.get('%s/quantal-ubuntu_stamp' % uri)
+        ubuntu_stamp = requests.get('%s/quantal-ubuntu_stamp' % uri,
+                                    proxies=urllib.getproxies())
         if ubuntu_stamp.status_code != 200:
-            ubuntu_stamp = requests.get('%s/ubuntu_stamp' % uri)
+            ubuntu_stamp = requests.get('%s/ubuntu_stamp' % uri,
+                                        proxies=urllib.getproxies())
         if ubuntu_stamp.status_code != 200:
             log.error('Latest build detection not supported... bailing')
             exit(1)