---

yaml
---
r: 276383
b: refs/heads/master
c: 18dafe8
h: refs/heads/master
i:
  276381: 16f246e
  276379: 84c2e04
  276375: b851413
  276367: 661802f
  276351: a8307a2

Author: cyplo

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f5884f6824291cda15096d84af9e346e13a41578
+refs/heads/master: 18dafe83b5411e76a13f5e813dae1bec71ef07a6
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
 refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/bootstrap/bootstrap.py

@@ -25,25 +25,25 @@ def get(url, path, verbose=False):
     temp_path = temp_file.name
     sha_file = tempfile.NamedTemporaryFile(suffix=".sha256", delete=True)
     sha_path = sha_file.name
-    download(sha_path, sha_url, temp_path, url, verbose)
+    download(sha_path, sha_url, verbose)
+    download(temp_path, url, verbose)
     verify(sha_path, temp_path, verbose)
     sha_file.close()
     print("moving " + temp_path + " to " + path)
     shutil.move(temp_path, path)
     temp_file.close()
 
 
-def download(sha_path, sha_url, temp_path, url, verbose):
-    for _url, _path in ((url, temp_path), (sha_url, sha_path)):
-        print("downloading " + _url + " to " + _path)
-        # see http://serverfault.com/questions/301128/how-to-download
-        if sys.platform == 'win32':
-            run(["PowerShell.exe", "/nologo", "-Command",
-                 "(New-Object System.Net.WebClient)"
-                 ".DownloadFile('{}', '{}')".format(_url, _path)],
-                verbose=verbose)
-        else:
-            run(["curl", "-o", _path, _url], verbose=verbose)
+def download(path, url, verbose):
+    print("downloading " + url + " to " + path)
+    # see http://serverfault.com/questions/301128/how-to-download
+    if sys.platform == 'win32':
+        run(["PowerShell.exe", "/nologo", "-Command",
+             "(New-Object System.Net.WebClient)"
+             ".DownloadFile('{}', '{}')".format(url, path)],
+            verbose=verbose)
+    else:
+        run(["curl", "-o", path, url], verbose=verbose)
 
 
 def verify(sha_path, temp_path, verbose):