Skip to content

Commit 202260f

Browse files
committed
Attempt to fix windows builder.
1 parent c9b14cc commit 202260f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/etc/get-snapshot.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ def unpack_snapshot(triple, snap):
99
tar = tarfile.open(dl_path)
1010
kernel = get_kernel(triple)
1111
for p in tar.getnames():
12-
name = p.replace("rust-stage0/", "", 1);
12+
13+
# FIXME: Fix this once win32 snapshot globs are fixed.
14+
name = p.replace("rust-stage0/stage3/", "", 1);
15+
name = name.replace("rust-stage0/", "", 1);
16+
1317
stagep = os.path.join(triple, "stage0")
1418
fp = os.path.join(stagep, name)
1519
print("extracting " + p)

src/etc/snapshot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def make_snapshot(stage, triple, flag):
129129
file0 = partial_snapshot_name(date, rev, platform)
130130

131131
def in_tar_name(fn):
132-
cs = fn.split(os.sep)
132+
cs = re.split(r"[\\/]", fn)
133133
if len(cs) >= 2:
134134
return os.sep.join(cs[-2:])
135135

0 commit comments

Comments
 (0)