fix to new model where triple is explicit
This commit is contained in:
parent
44ccc36d93
commit
89a4f8c751
@ -4,11 +4,11 @@ import os, tarfile, hashlib, re, shutil, sys
|
|||||||
from snapshot import *
|
from snapshot import *
|
||||||
|
|
||||||
|
|
||||||
def unpack_snapshot(snap):
|
def unpack_snapshot(triple, snap):
|
||||||
dl_path = os.path.join(download_dir_base, snap)
|
dl_path = os.path.join(download_dir_base, snap)
|
||||||
print("opening snapshot " + dl_path)
|
print("opening snapshot " + dl_path)
|
||||||
tar = tarfile.open(dl_path)
|
tar = tarfile.open(dl_path)
|
||||||
kernel = get_kernel()
|
kernel = get_kernel(triple)
|
||||||
for name in snapshot_files[kernel]:
|
for name in snapshot_files[kernel]:
|
||||||
p = "rust-stage0/" + name
|
p = "rust-stage0/" + name
|
||||||
stagep = os.path.join(triple, "stage0")
|
stagep = os.path.join(triple, "stage0")
|
||||||
@ -53,12 +53,12 @@ def determine_curr_snapshot(triple):
|
|||||||
raise Exception("no snapshot file found for platform %s, rev %s" %
|
raise Exception("no snapshot file found for platform %s, rev %s" %
|
||||||
(platform, rev))
|
(platform, rev))
|
||||||
|
|
||||||
return full_snapshot_name(date, rev, get_platform(), hsh)
|
return full_snapshot_name(date, rev, platform, hsh)
|
||||||
|
|
||||||
# Main
|
# Main
|
||||||
|
|
||||||
triple = sys.argv[1]
|
triple = sys.argv[1]
|
||||||
snap = determine_curr_snapshot_for_platform()
|
snap = determine_curr_snapshot(triple)
|
||||||
dl = os.path.join(download_dir_base, snap)
|
dl = os.path.join(download_dir_base, snap)
|
||||||
url = download_url_base + "/" + snap
|
url = download_url_base + "/" + snap
|
||||||
print("determined most recent snapshot: " + snap)
|
print("determined most recent snapshot: " + snap)
|
||||||
@ -71,4 +71,4 @@ if (snap_filename_hash_part(snap) == hash_file(dl)):
|
|||||||
else:
|
else:
|
||||||
raise Exception("bad hash on download")
|
raise Exception("bad hash on download")
|
||||||
|
|
||||||
unpack_snapshot(snap)
|
unpack_snapshot(triple, snap)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user