Skip to content

Not all exceptions will have a .read() method. #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmchilton merged 1 commit into from
Apr 30, 2015
Merged

Not all exceptions will have a .read() method. #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions planemo/commands/cmd_shed_upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,20 @@ def __handle_upload(ctx, realized_repository, **kwds):
try:
tsi.repositories.update_repository(repo_id, tar_path, **update_kwds)
except Exception as e:
exception_content = e.read()
try:
# Galaxy passes nice JSON messages as their errors, which bioblend
# blindly returns. Attempt to parse those.
upstream_error = json.loads(exception_content)
error(upstream_error['err_msg'])
except Exception as e2:
if hasattr(e, "read"):
exception_content = e.read()
try:
# Galaxy passes nice JSON messages as their errors, which bioblend
# blindly returns. Attempt to parse those.
upstream_error = json.loads(exception_content)
error(upstream_error['err_msg'])
except Exception as e2:
error("Could not update %s" % realized_repository.name)
error(exception_content)
error(e2.read())
else:
error("Could not update %s" % realized_repository.name)
error(exception_content)
error(e2.read())
error(str(e))
return -1
info("Repository %s updated successfully." % realized_repository.name)
return 0
⚡