]> git.lizzy.rs Git - rust.git/commitdiff
Fix PEP8 in get-snapshot
authorRicho Healey <richo@psych0tik.net>
Tue, 27 Jan 2015 08:09:13 +0000 (00:09 -0800)
committerRicho Healey <richo@psych0tik.net>
Tue, 27 Jan 2015 09:09:38 +0000 (01:09 -0800)
src/etc/get-snapshot.py

index 886a84bd819a9ec60dd958ec2746b4d5513d7399..442c50ed7731722a946d41061a52aa0833b388ea 100755 (executable)
@@ -14,32 +14,32 @@ import os, tarfile, re, shutil, sys
 from snapshot import *
 
 def unpack_snapshot(triple, dl_path):
-  print("opening snapshot " + dl_path)
-  tar = tarfile.open(dl_path)
-  kernel = get_kernel(triple)
+    print("opening snapshot " + dl_path)
+    tar = tarfile.open(dl_path)
+    kernel = get_kernel(triple)
 
-  stagep = os.path.join(triple, "stage0")
+    stagep = os.path.join(triple, "stage0")
 
-  # Remove files from prior unpackings, since snapshot rustc may not
-  # be able to disambiguate between multiple candidate libraries.
-  # (Leave dirs in place since extracting step still needs them.)
-  for root, _, files in os.walk(stagep):
-    for f in files:
-      print("removing " + os.path.join(root, f))
-      os.unlink(os.path.join(root, f))
+    # Remove files from prior unpackings, since snapshot rustc may not
+    # be able to disambiguate between multiple candidate libraries.
+    # (Leave dirs in place since extracting step still needs them.)
+    for root, _, files in os.walk(stagep):
+        for f in files:
+            print("removing " + os.path.join(root, f))
+            os.unlink(os.path.join(root, f))
 
-  for p in tar.getnames():
-    name = p.replace("rust-stage0/", "", 1);
+    for p in tar.getnames():
+        name = p.replace("rust-stage0/", "", 1);
 
-    fp = os.path.join(stagep, name)
-    print("extracting " + p)
-    tar.extract(p, download_unpack_base)
-    tp = os.path.join(download_unpack_base, p)
-    if os.path.isdir(tp) and os.path.exists(fp):
-        continue
-    shutil.move(tp, fp)
-  tar.close()
-  shutil.rmtree(download_unpack_base)
+        fp = os.path.join(stagep, name)
+        print("extracting " + p)
+        tar.extract(p, download_unpack_base)
+        tp = os.path.join(download_unpack_base, p)
+        if os.path.isdir(tp) and os.path.exists(fp):
+                continue
+        shutil.move(tp, fp)
+    tar.close()
+    shutil.rmtree(download_unpack_base)
 
 
 # Main
@@ -50,21 +50,21 @@ def unpack_snapshot(triple, dl_path):
 
 triple = sys.argv[1]
 if len(sys.argv) == 3:
-  dl_path = sys.argv[2]
+    dl_path = sys.argv[2]
 else:
-  snap = determine_curr_snapshot(triple)
-  dl = os.path.join(download_dir_base, snap)
-  url = download_url_base + "/" + snap
-  print("determined most recent snapshot: " + snap)
+    snap = determine_curr_snapshot(triple)
+    dl = os.path.join(download_dir_base, snap)
+    url = download_url_base + "/" + snap
+    print("determined most recent snapshot: " + snap)
 
-  if (not os.path.exists(dl)):
-    get_url_to_file(url, dl)
+    if (not os.path.exists(dl)):
+        get_url_to_file(url, dl)
 
-  if (snap_filename_hash_part(snap) == hash_file(dl)):
-    print("got download with ok hash")
-  else:
-    raise Exception("bad hash on download")
+    if (snap_filename_hash_part(snap) == hash_file(dl)):
+        print("got download with ok hash")
+    else:
+        raise Exception("bad hash on download")
 
-  dl_path = os.path.join(download_dir_base, snap)
+    dl_path = os.path.join(download_dir_base, snap)
 
 unpack_snapshot(triple, dl_path)