---

yaml
---
r: 176991
b: refs/heads/master
c: f230683
h: refs/heads/master
i:
  176989: 04566f6
  176987: 33478e8
  176983: 8ffe999
  176975: 89945e4
  176959: 4cde66d
v: v3

Author: richo

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6af36031e2f286e6cca37f14ede514fff46b6e6f
+refs/heads/master: f230683b1a01500af3f74e3e357441c67b77c4b6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a45e117733b866302fa99390553d1c548508dcca
 refs/heads/try: fde4472848b662a4d1236388c4cf15e2450237e6

trunk/src/etc/get-snapshot.py

@@ -14,32 +14,32 @@
 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)