OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Attempt to fix windows builder.

Browse Source
This commit is contained in:
Graydon Hoare 2011-12-13 12:31:50 -08:00
parent c9b14cc0dd
commit 202260f19e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/etc/get-snapshot.py
View File

@ -9,7 +9,11 @@ def unpack_snapshot(triple, snap):
tar = tarfile.open(dl_path) tar = tarfile.open(dl_path)
kernel = get_kernel(triple) kernel = get_kernel(triple)
for p in tar.getnames(): 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") stagep = os.path.join(triple, "stage0")
fp = os.path.join(stagep, name) fp = os.path.join(stagep, name)
print("extracting " + p) print("extracting " + p)

2
src/etc/snapshot.py
View File

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