Apple-2-SW/a2server
1
0
Fork 0
mirror of https://github.com/RasppleII/a2server.git synced 2025-01-10 19:29:54 +00:00
Code Issues Projects Releases Wiki Activity

install-gsos.py: Improve download func output

Browse Source
This commit is contained in:
T. Joseph Carter 2015-11-14 10:43:59 -08:00
parent db1fea3000
commit b96fe0a3bb
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
experimental/install-gsos.py
View File

@ -1,6 +1,9 @@
#! /usr/bin/env python
# vim: set tabstop=4 shiftwidth=4 expandtab filetype=python:
from __future__ import print_function
import os, sys, subprocess
import tempfile
import hashlib
@ -103,10 +106,8 @@ def download_from_sources(fileinfo, output_dir):
if not quiet:
print("Downloading %s:" % (fileinfo["file"]))
for (source, url) in fileinfo["sources"]:
if verbose:
print(" Trying %s (%s)..." % (source, url))
elif not quiet:
print(" Trying %s..." % (source))
if not quiet:
print(" Trying %s..." % (source), end="")
try:
html = urlrequest.urlopen(url)
@ -115,6 +116,8 @@ def download_from_sources(fileinfo, output_dir):
f.write(data)
f.close()
except:
if not quiet:
print(" download failed.")
if 'f' in locals():
if not f.isclosed():
f.close()
@ -122,12 +125,12 @@ def download_from_sources(fileinfo, output_dir):
digest = sha1sum_file(output_path)
if digest == fileinfo["digest"]:
if verbose:
print(" Digest of %s matches, download complete.\n" % (digest))
elif not quiet:
print(" Download complete.\n")
if not quiet:
print(" successfully downloaded.")
return True
else:
if not quiet:
print(" failed (digest mismatch).")
if verbose:
print(" Expected: %s\n Received: %s"
% (fileinfo["digest"], digest))