Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2018-01-19 03:18:23 -05:00
5 changed files with 15 additions and 6 deletions

View File

@@ -228,7 +228,7 @@ def main(in_base, out_base, files, codes, outfile=None,
if current_outfile:
sys.stdout.write("%s\r" %
status_msg(do_verify, tot_files, okay_files, failed_files,
verify_failed_files, None))
verify_failed_files, do_verify))
sys.stdout.flush()
if current_outfile:
sys.stdout.write("\n")
@@ -250,7 +250,7 @@ else:
def status_msg(do_verify, tot_files, okay_files, failed_files,
verify_failed_files, weak_verify):
if weak_verify:
if weak_verify == 'weak':
verification_type = 'weak'
else:
verification_type = 'strong'