From 904a6006c551c7dbdc7ae0399082f02e068a8097 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 3 Nov 2022 13:29:02 -0400 Subject: [PATCH] Additional debugging when handling API errors during repository upload. --- lib/tool_shed/webapp/api/repositories.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/tool_shed/webapp/api/repositories.py b/lib/tool_shed/webapp/api/repositories.py index c5d3806e2b0..b69750ba2a5 100644 --- a/lib/tool_shed/webapp/api/repositories.py +++ b/lib/tool_shed/webapp/api/repositories.py @@ -1082,6 +1082,8 @@ class RepositoriesController(BaseAPIController): commit_message, new_repo_alert, ) + upload_message = message + files_removed = util.listify(undesirable_dirs_removed) + util.listify(undesirable_files_removed) if ok: # Update the repository files for browsing. hg_util.update_repository(repo_dir) @@ -1106,6 +1108,11 @@ class RepositoriesController(BaseAPIController): if os.path.exists(uploaded_file_name): os.remove(uploaded_file_name) if not ok: - return {"err_msg": message} + return { + "err_msg": message, + "content_alert": content_alert_str, + "files_removed": files_removed, + "upload_message": upload_message, + } else: return {"message": message}