1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/9e35739c2da1/ changeset: 9e35739c2da1 user: greg date: 2012-08-30 16:54:12 summary: Fix for loading a tool from a tool config located in a temporary working directory. affected #: 2 files
diff -r 9ff18845d24b092a9297d1ec4a803b7e0e5fae4a -r 9e35739c2da19583f24784d1b06e656dede2643a lib/galaxy/webapps/community/controllers/common.py --- a/lib/galaxy/webapps/community/controllers/common.py +++ b/lib/galaxy/webapps/community/controllers/common.py @@ -722,7 +722,7 @@ error, correction_msg = handle_sample_tool_data_table_conf_file( trans.app, tool_data_table_config ) manifest_ctx, ctx_file = get_ctx_file_path_from_manifest( tool_config_filename, repo, changeset_revision ) if manifest_ctx and ctx_file: - tool, message = load_tool_from_tmp_config( trans, manifest_ctx, ctx_file, work_dir ) + tool, message = load_tool_from_tmp_config( trans, repo, manifest_ctx, ctx_file, work_dir ) try: shutil.rmtree( work_dir ) except: @@ -732,7 +732,7 @@ # Reset the tool_data_tables by loading the empty tool_data_table_conf.xml file. reset_tool_data_tables( trans.app ) return repository, tool, message -def load_tool_from_tmp_config( trans, ctx, ctx_file, work_dir ): +def load_tool_from_tmp_config( trans, repo, ctx, ctx_file, work_dir ): tool = None message = '' tmp_tool_config = get_named_tmpfile_from_ctx( ctx, ctx_file, work_dir )
diff -r 9ff18845d24b092a9297d1ec4a803b7e0e5fae4a -r 9e35739c2da19583f24784d1b06e656dede2643a lib/galaxy/webapps/community/controllers/repository.py --- a/lib/galaxy/webapps/community/controllers/repository.py +++ b/lib/galaxy/webapps/community/controllers/repository.py @@ -2243,7 +2243,7 @@ work_dir = tempfile.mkdtemp() manifest_ctx, ctx_file = get_ctx_file_path_from_manifest( relative_path_to_tool_config, repo, changeset_revision ) if manifest_ctx and ctx_file: - tool, message = load_tool_from_tmp_config( trans, manifest_ctx, ctx_file, work_dir ) + tool, message = load_tool_from_tmp_config( trans, repo, manifest_ctx, ctx_file, work_dir ) break if guid: tool_lineage = self.get_versions_of_tool( trans, repository, repository_metadata, guid )
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.