aboutsummaryrefslogtreecommitdiff
path: root/bh20simplewebuploader/main.py
diff options
context:
space:
mode:
authorPeter Amstutz2020-07-16 14:48:22 -0400
committerPeter Amstutz2020-07-16 14:48:22 -0400
commitd34374f0e822edd1539ea5de6f8522f2b761de3f (patch)
tree1bcdb209a7fc26eae76da4240564e53875afa2ae /bh20simplewebuploader/main.py
parent474d15e17be63046a091615e89ba63adecdb109b (diff)
downloadbh20-seq-resource-d34374f0e822edd1539ea5de6f8522f2b761de3f.tar.gz
bh20-seq-resource-d34374f0e822edd1539ea5de6f8522f2b761de3f.tar.lz
bh20-seq-resource-d34374f0e822edd1539ea5de6f8522f2b761de3f.zip
Improve uploader reporting.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
Diffstat (limited to 'bh20simplewebuploader/main.py')
-rw-r--r--bh20simplewebuploader/main.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bh20simplewebuploader/main.py b/bh20simplewebuploader/main.py
index 62b68d9..c814f30 100644
--- a/bh20simplewebuploader/main.py
+++ b/bh20simplewebuploader/main.py
@@ -445,12 +445,12 @@ def receive_files():
if result.returncode != 0:
# It didn't work. Complain.
- error_message="Uploader returned value {} and said:".format(result.returncode) + str(result.stderr.decode('utf-8'))
+ error_message="Uploader returned value {} and said:\n".format(result.returncode) + str(result.stderr.decode('utf-8'))
print(error_message, file=sys.stderr)
return (render_template('error.html', error_message=error_message), 403)
else:
# It worked. Say so.
- return render_template('success.html', log=result.stdout.decode('utf-8', errors='replace'))
+ return render_template('success.html', log=result.stderr.decode('utf-8', errors='replace'))
finally:
shutil.rmtree(dest_dir)