---

yaml
---
r: 6672
b: refs/heads/master
c: 202260f
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9b14cc0ddb6789cae25ca73ccbd1ee5b4039959
+refs/heads/master: 202260f19e6db4d410c121aba06a27e73366d822

trunk/src/etc/get-snapshot.py

@@ -9,7 +9,11 @@ def unpack_snapshot(triple, snap):
   tar = tarfile.open(dl_path)
   kernel = get_kernel(triple)
   for p in tar.getnames():
-    name = p.replace("rust-stage0/", "", 1);
+
+    # FIXME: Fix this once win32 snapshot globs are fixed.
+    name = p.replace("rust-stage0/stage3/", "", 1);
+    name = name.replace("rust-stage0/", "", 1);
+
     stagep = os.path.join(triple, "stage0")
     fp = os.path.join(stagep, name)
     print("extracting " + p)

trunk/src/etc/snapshot.py

@@ -129,7 +129,7 @@ def make_snapshot(stage, triple, flag):
     file0 = partial_snapshot_name(date, rev, platform)
 
     def in_tar_name(fn):
-      cs = fn.split(os.sep)
+      cs = re.split(r"[\\/]", fn)
       if len(cs) >= 2:
         return os.sep.join(cs[-2:])