Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim-plugins.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hörist <forenjunkie@chello.at>2017-03-15 19:54:57 +0300
committerPhilipp Hörist <forenjunkie@chello.at>2017-03-15 19:55:34 +0300
commitb44bc8cc4d02c11f217e0f4cc86e18cf92487029 (patch)
tree93104bdd051c22f2f22aadc0867871016d5689df /httpupload
parent62aa89878c7e98802338d7f5fa84ec78f5f1a9ee (diff)
[httpupload] Return error message correctly
Diffstat (limited to 'httpupload')
-rw-r--r--httpupload/httpupload.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/httpupload/httpupload.py b/httpupload/httpupload.py
index 17698e2..e4267f9 100644
--- a/httpupload/httpupload.py
+++ b/httpupload/httpupload.py
@@ -479,10 +479,11 @@ class Base(object):
return transfer.getcode()
except UploadAbortedException as error:
log.info('Upload Aborted')
+ return str(error)
except Exception as error:
gobject.idle_add(progress_window.close_dialog)
log.exception('Error')
- return str(error)
+ return str(error)
log.info("Uploading file to '%s'..." % str(put.getData()))
log.info("Please download from '%s' later..." % str(get.getData()))