mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have verify() return a bool rather than a generic RuntimeError

Browse Source
This commit is contained in:
Ximin Luo 2016-07-06 00:07:26 +02:00
parent ab5309e9e8
commit 912a9d0ad8
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bootstrap/bootstrap.py
View File

@ -32,15 +32,15 @@ def get(url, path, verbose=False):
try:
download(sha_path, sha_url, verbose)
if os.path.exists(path):
try:
verify(path, sha_path, verbose)
if verify(path, sha_path, verbose):
print("using already-download file " + path)
return
except Exception as e:
print("failed verification for already-download file " + path)
else:
print("ignoring already-download file " + path + " due to failed verification")
os.unlink(path)
download(temp_path, url, verbose)
verify(temp_path, sha_path, verbose)
if not verify(temp_path, sha_path, verbose):
raise RuntimeError("failed verification")
print("moving {} to {}".format(temp_path, path))
shutil.move(temp_path, path)
finally:
@ -72,13 +72,12 @@ def verify(path, sha_path, verbose):
found = hashlib.sha256(f.read()).hexdigest()
with open(sha_path, "r") as f:
expected, _ = f.readline().split()
if found != expected:
err = ("invalid checksum:\n"
verified = found == expected
if not verified and verbose:
print("invalid checksum:\n"
" found: {}\n"
" expected: {}".format(found, expected))
if verbose:
raise RuntimeError(err)
sys.exit(err)
return verified
def unpack(tarball, dst, verbose=False, match=None):