1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/fab5274bf15a/ changeset: fab5274bf15a user: greg date: 2012-08-31 21:25:48 summary: Display error message when unable to set metadata on a tool shed repository because of invalid tool configs. Also correct the way metadata is set on a tool shed repository when all repository files are deleted in a changeset. affected #: 2 files
diff -r 0e3ecd0ea81876e4d32d108be1e02e393846e4e8 -r fab5274bf15a15ff7c710b60f8b521478c20f907 lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -609,7 +609,10 @@ is_tool = False if is_tool: tool, valid, error_message = load_tool_from_config( app, full_path ) - if tool is not None: + if tool is None: + if not valid: + invalid_file_tups.append( ( name, error_message ) ) + else: invalid_files_and_errors_tups = check_tool_input_params( app, files_dir, name, tool, sample_file_metadata_paths, webapp=webapp ) can_set_metadata = True for tup in invalid_files_and_errors_tups:
diff -r 0e3ecd0ea81876e4d32d108be1e02e393846e4e8 -r fab5274bf15a15ff7c710b60f8b521478c20f907 lib/galaxy/webapps/community/controllers/common.py --- a/lib/galaxy/webapps/community/controllers/common.py +++ b/lib/galaxy/webapps/community/controllers/common.py @@ -921,9 +921,6 @@ ancestor_metadata_dict = None elif ancestor_metadata_dict: # We reach here only if current_metadata_dict is empty and ancestor_metadata_dict is not. - ancestor_changeset_revision = current_changeset_revision - metadata_changeset_revision = current_changeset_revision - metadata_dict = ancestor_metadata_dict if not ctx.children(): # We're at the end of the change log. repository_metadata = create_or_update_repository_metadata( trans, id, repository, metadata_changeset_revision, metadata_dict )
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.