2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2c62316e9a5b/ Changeset: 2c62316e9a5b User: inithello Date: 2013-12-20 18:22:01 Summary: Order repository revisions by ID, descending. Affected #: 1 file diff -r c125d7050c3b5a34305c377cd31b3a77be753d99 -r 2c62316e9a5bd985b264e7bf7d10eadc1b74cde8 lib/galaxy/webapps/tool_shed/api/repository_revisions.py --- a/lib/galaxy/webapps/tool_shed/api/repository_revisions.py +++ b/lib/galaxy/webapps/tool_shed/api/repository_revisions.py @@ -155,7 +155,7 @@ try: query = trans.sa_session.query( trans.app.model.RepositoryMetadata ) \ .filter( and_( *clause_list ) ) \ - .order_by( trans.app.model.RepositoryMetadata.table.c.repository_id ) \ + .order_by( trans.app.model.RepositoryMetadata.table.c.repository_id.desc() ) \ .all() for repository_metadata in query: repository_metadata_dict = repository_metadata.to_dict( view='collection', https://bitbucket.org/galaxy/galaxy-central/commits/68c080722bc7/ Changeset: 68c080722bc7 User: inithello Date: 2013-12-20 18:22:24 Summary: Fix for error message when resetting metadata on an installed repository. Affected #: 1 file diff -r 2c62316e9a5bd985b264e7bf7d10eadc1b74cde8 -r 68c080722bc7f6accf73325bdf049eb84125da27 lib/tool_shed/util/tool_util.py --- a/lib/tool_shed/util/tool_util.py +++ b/lib/tool_shed/util/tool_util.py @@ -247,12 +247,16 @@ bold_start = '' bold_end = '' message = '' + if trans.webapp.name == 'galaxy': + tip_rev = str( repository.changeset_revision ) + else: + tip_rev = str( repository.tip( trans.app ) ) if not displaying_invalid_tool: if metadata_dict: - message += "Metadata may have been defined for some items in revision '%s'. " % str( repository.tip( trans.app ) ) + message += "Metadata may have been defined for some items in revision '%s'. " % tip_rev message += "Correct the following problems if necessary and reset metadata.%s" % new_line else: - message += "Metadata cannot be defined for revision '%s' so this revision cannot be automatically " % str( repository.tip( trans.app ) ) + message += "Metadata cannot be defined for revision '%s' so this revision cannot be automatically " % tip_rev message += "installed into a local Galaxy instance. Correct the following problems and reset metadata.%s" % new_line for itc_tup in invalid_file_tups: tool_file, exception_msg = itc_tup 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.