1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/91217d6ead5a/ changeset: 91217d6ead5a user: greg date: 2012-06-05 20:59:42 summary: Fixes for setting metadata on tool shed repoistories. affected #: 2 files
diff -r d7580315fa206bcc64bc7607ee52bccfbf95e42f -r 91217d6ead5a58609e0cc0ac839d2c2a6bc94691 lib/galaxy/webapps/community/controllers/common.py --- a/lib/galaxy/webapps/community/controllers/common.py +++ b/lib/galaxy/webapps/community/controllers/common.py @@ -1010,12 +1010,12 @@ ancestor_changeset_revision = None ancestor_metadata_dict = None elif ancestor_metadata_dict: - # Our current change set has no metadata, but our ancestor change set has metadata, so save it. - create_or_update_repository_metadata( trans, id, repository, ancestor_changeset_revision, ancestor_metadata_dict ) - # Keep track of the changeset_revisions that we've persisted. - changeset_revisions.append( ancestor_changeset_revision ) - ancestor_changeset_revision = None - ancestor_metadata_dict = None + if not ctx.children(): + # We're at the end of the change log. + create_or_update_repository_metadata( trans, id, repository, current_changeset_revision, ancestor_metadata_dict ) + changeset_revisions.append( current_changeset_revision ) + ancestor_changeset_revision = None + ancestor_metadata_dict = None clean_repository_metadata( trans, id, changeset_revisions ) add_repository_metadata_tool_versions( trans, id, changeset_revisions ) if missing_sample_files: @@ -1083,7 +1083,7 @@ repository_metadata.metadata = metadata_dict trans.sa_session.add( repository_metadata ) trans.sa_session.flush() - elif not invalid_files: + elif updating_tip and len( repo ) == 1 and not invalid_files: message = "Revision '%s' includes no tools, datatypes or exported workflows for which metadata can " % str( changeset_revision ) message += "be defined so this revision cannot be automatically installed into a local Galaxy instance." status = "error" @@ -1120,7 +1120,6 @@ status = 'error' return message, status def set_repository_metadata_due_to_new_tip( trans, id, repository, content_alert_str=None, **kwd ): - message = util.restore_text( kwd.get( 'message', '' ) ) # Set metadata on the repository tip. error_message, status = set_repository_metadata( trans, id, repository.tip, content_alert_str=content_alert_str, **kwd ) if not error_message:
diff -r d7580315fa206bcc64bc7607ee52bccfbf95e42f -r 91217d6ead5a58609e0cc0ac839d2c2a6bc94691 lib/galaxy/webapps/community/controllers/upload.py --- a/lib/galaxy/webapps/community/controllers/upload.py +++ b/lib/galaxy/webapps/community/controllers/upload.py @@ -158,6 +158,8 @@ message += " %d files were removed from the repository root. " % len( files_to_remove ) kwd[ 'message' ] = message set_repository_metadata_due_to_new_tip( trans, repository_id, repository, content_alert_str=content_alert_str, **kwd ) + # Reset the tool_data_tables by loading the empty tool_data_table_conf.xml file. + reset_tool_data_tables( trans.app ) trans.response.send_redirect( web.url_for( controller='repository', action='browse_repository', id=repository_id,
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.