2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7c60a5b67c3e/ Changeset: 7c60a5b67c3e Branch: next-stable User: greg Date: 2013-11-01 16:53:44 Summary: Return an error response rather than just logging a message when uploading a directroy or a tarball that contains a tool dependency definition that is missing wither an <actions> tag set or an <actions_group> tag set. Affected #: 1 file diff -r a1b7ad9035bf945f78edfb84204d746fd74a8929 -r 7c60a5b67c3ec7825d3d2511f27867823de19350 lib/galaxy/webapps/tool_shed/controllers/upload.py --- a/lib/galaxy/webapps/tool_shed/controllers/upload.py +++ b/lib/galaxy/webapps/tool_shed/controllers/upload.py @@ -295,9 +295,8 @@ elif os.path.split( uploaded_file_name )[ -1 ] == suc.TOOL_DEPENDENCY_DEFINITION_FILENAME: # Inspect the contents of the file to see if changeset_revision values are missing and if so, set them appropriately. altered, root_elem, error_message = commit_util.handle_tool_dependencies_definition( trans, uploaded_file_name ) - # Can this be displayed? if error_message: - log.debug( str( error_message ) ) + return False, error_message, [], '', [], [] if altered: tmp_filename = xml_util.create_and_write_tmp_file( root_elem ) shutil.move( tmp_filename, uploaded_file_name ) @@ -360,8 +359,7 @@ # Inspect the contents of the file to see if changeset_revision values are missing and if so, set them appropriately. altered, root_elem, error_message = commit_util.handle_tool_dependencies_definition( trans, uploaded_file_name ) if error_message: - # Can this be displayed? - log.debug( error_message ) + return False, error_message, [], '', [], [] if altered: tmp_filename = xml_util.create_and_write_tmp_file( root_elem ) shutil.move( tmp_filename, uploaded_file_name ) https://bitbucket.org/galaxy/galaxy-central/commits/ef83037950ea/ Changeset: ef83037950ea User: greg Date: 2013-11-01 16:54:18 Summary: Merged from next-stable Affected #: 1 file diff -r c4a7154555192be09051a3fbb1ad655a3926be3b -r ef83037950ea0e867271999e2cc1902bd9f65302 lib/galaxy/webapps/tool_shed/controllers/upload.py --- a/lib/galaxy/webapps/tool_shed/controllers/upload.py +++ b/lib/galaxy/webapps/tool_shed/controllers/upload.py @@ -309,9 +309,8 @@ elif os.path.split( uploaded_file_name )[ -1 ] == suc.TOOL_DEPENDENCY_DEFINITION_FILENAME: # Inspect the contents of the file to see if changeset_revision values are missing and if so, set them appropriately. altered, root_elem, error_message = commit_util.handle_tool_dependencies_definition( trans, uploaded_file_name ) - # Can this be displayed? if error_message: - log.debug( str( error_message ) ) + return False, error_message, [], '', [], [] if altered: tmp_filename = xml_util.create_and_write_tmp_file( root_elem ) shutil.move( tmp_filename, uploaded_file_name ) @@ -378,8 +377,7 @@ # Inspect the contents of the file to see if changeset_revision values are missing and if so, set them appropriately. altered, root_elem, error_message = commit_util.handle_tool_dependencies_definition( trans, uploaded_file_name ) if error_message: - # Can this be displayed? - log.debug( error_message ) + return False, error_message, [], '', [], [] if altered: tmp_filename = xml_util.create_and_write_tmp_file( root_elem ) shutil.move( tmp_filename, uploaded_file_name ) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.