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

Fix PEP8 in get-snapshot

Browse Source
This commit is contained in:
Richo Healey 2015-01-27 00:09:13 -08:00
parent 6af36031e2
commit f230683b1a
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,32 +14,32 @@ import os, tarfile, re, shutil, sys
from snapshot import * from snapshot import *
def unpack_snapshot(triple, dl_path): def unpack_snapshot(triple, dl_path):
print("opening snapshot " + dl_path) print("opening snapshot " + dl_path)
tar = tarfile.open(dl_path) tar = tarfile.open(dl_path)
kernel = get_kernel(triple) 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 # Remove files from prior unpackings, since snapshot rustc may not
# be able to disambiguate between multiple candidate libraries. # be able to disambiguate between multiple candidate libraries.
# (Leave dirs in place since extracting step still needs them.) # (Leave dirs in place since extracting step still needs them.)
for root, _, files in os.walk(stagep): for root, _, files in os.walk(stagep):
for f in files: for f in files:
print("removing " + os.path.join(root, f)) print("removing " + os.path.join(root, f))
os.unlink(os.path.join(root, f)) os.unlink(os.path.join(root, f))
for p in tar.getnames(): for p in tar.getnames():
name = p.replace("rust-stage0/", "", 1); name = p.replace("rust-stage0/", "", 1);
fp = os.path.join(stagep, name) fp = os.path.join(stagep, name)
print("extracting " + p) print("extracting " + p)
tar.extract(p, download_unpack_base) tar.extract(p, download_unpack_base)
tp = os.path.join(download_unpack_base, p) tp = os.path.join(download_unpack_base, p)
if os.path.isdir(tp) and os.path.exists(fp): if os.path.isdir(tp) and os.path.exists(fp):
continue continue
shutil.move(tp, fp) shutil.move(tp, fp)
tar.close() tar.close()
shutil.rmtree(download_unpack_base) shutil.rmtree(download_unpack_base)
# Main # Main
@ -50,21 +50,21 @@ def unpack_snapshot(triple, dl_path):
triple = sys.argv[1] triple = sys.argv[1]
if len(sys.argv) == 3: if len(sys.argv) == 3:
dl_path = sys.argv[2] dl_path = sys.argv[2]
else: else:
snap = determine_curr_snapshot(triple) 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)
if (not os.path.exists(dl)): if (not os.path.exists(dl)):
get_url_to_file(url, dl) get_url_to_file(url, dl)
if (snap_filename_hash_part(snap) == hash_file(dl)): if (snap_filename_hash_part(snap) == hash_file(dl)):
print("got download with ok hash") print("got download with ok hash")
else: else:
raise Exception("bad hash on download") 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) unpack_snapshot(triple, dl_path)