1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/56492a1d0d35/ Changeset: 56492a1d0d35 User: greg Date: 2014-01-16 22:02:39 Summary: Re-include deprecated repositories when resetting metadata since they can be dependencies of installable repositories. Affected #: 3 files diff -r dec86d2bd3b10c16c91ec2847840c62b5e2bfe59 -r 56492a1d0d352db016e7ba785fcbc9822b604d61 lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py --- a/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py +++ b/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py @@ -524,7 +524,7 @@ results[ 'repository_status' ].append( message ) stop_time = strftime( "%Y-%m-%d %H:%M:%S" ) results[ 'stop_time' ] = stop_time - return json.to_json_string( results, sort_keys=True, indent=4 * ' ' ) + return json.to_json_string( results, sort_keys=True, indent=4 ) @web.expose_api def show( self, trans, id, **kwd ): diff -r dec86d2bd3b10c16c91ec2847840c62b5e2bfe59 -r 56492a1d0d352db016e7ba785fcbc9822b604d61 lib/galaxy/webapps/tool_shed/api/repositories.py --- a/lib/galaxy/webapps/tool_shed/api/repositories.py +++ b/lib/galaxy/webapps/tool_shed/api/repositories.py @@ -384,7 +384,7 @@ results = handle_repository( trans, repository, results ) stop_time = strftime( "%Y-%m-%d %H:%M:%S" ) results[ 'stop_time' ] = stop_time - return json.to_json_string( results, sort_keys=True, indent=4 * ' ' ) + return json.to_json_string( results, sort_keys=True, indent=4 ) @web.expose_api def reset_metadata_on_repository( self, trans, payload, **kwd ): @@ -423,7 +423,7 @@ results = handle_repository( trans, start_time, repository ) stop_time = strftime( "%Y-%m-%d %H:%M:%S" ) results[ 'stop_time' ] = stop_time - return json.to_json_string( results, sort_keys=True, indent=4 * ' ' ) + return json.to_json_string( results, sort_keys=True, indent=4 ) @web.expose_api_anonymous def show( self, trans, id, **kwd ): diff -r dec86d2bd3b10c16c91ec2847840c62b5e2bfe59 -r 56492a1d0d352db016e7ba785fcbc9822b604d61 lib/tool_shed/util/shed_util_common.py --- a/lib/tool_shed/util/shed_util_common.py +++ b/lib/tool_shed/util/shed_util_common.py @@ -877,8 +877,7 @@ username = trans.user.username clause_list = [] for repository in trans.sa_session.query( trans.model.Repository ) \ - .filter( and_( trans.model.Repository.table.c.deleted == False, - trans.model.Repository.table.c.deprecated == False ) ): + .filter( trans.model.Repository.table.c.deleted == False ): # Always reset metadata on all repositories of type tool_dependency_definition. if repository.type == rt_util.TOOL_DEPENDENCY_DEFINITION: clause_list.append( trans.model.Repository.table.c.id == repository.id ) @@ -905,14 +904,12 @@ else: if order: return trans.sa_session.query( trans.model.Repository ) \ - .filter( and_( trans.model.Repository.table.c.deleted == False, - trans.model.Repository.table.c.deprecated == False ) ) \ + .filter( trans.model.Repository.table.c.deleted == False ) \ .order_by( trans.model.Repository.table.c.name, trans.model.Repository.table.c.user_id ) else: return trans.sa_session.query( trans.model.Repository ) \ - .filter( and_( trans.model.Repository.table.c.deleted == False, - trans.model.Repository.table.c.deprecated == False ) ) + .filter( trans.model.Repository.table.c.deleted == False ) else: # We're in Galaxy. if order: @@ -1599,8 +1596,8 @@ return folder_contents def pretty_print( dict=None ): - if dict: - return json.to_json_string( dict, sort_keys=True, indent=4 * ' ' ) + if dict is not: + return json.to_json_string( dict, sort_keys=True, indent=4 ) def remove_dir( dir ): """Attempt to remove a directory from disk.""" 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.