1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/383bd3e846b9/ Changeset: 383bd3e846b9 User: greg Date: 2014-04-02 13:22:01 Summary: Don't require categories and status attributes to be associated with a repository being imported from a capsule, although they should always exist. Affected #: 1 file diff -r 69e3ed08c38219005aba4952716cc7f4afa184f0 -r 383bd3e846b97f5dc72422ff47dfdd98e3f132f5 lib/tool_shed/util/repository_maintenance_util.py --- a/lib/tool_shed/util/repository_maintenance_util.py +++ b/lib/tool_shed/util/repository_maintenance_util.py @@ -135,7 +135,8 @@ ( str( name ), str( username )) import_results_tups.append( ( ok, ( str( name ), str( username ) ), results_message ) ) else: - if repository_archive_dict[ 'status' ] is None: + status = repository_archive_dict.get( 'status', None ) + if status is None: # The repository does not yet exist in this Tool Shed and the current user is authorized to import # the current archive file. type = repository_archive_dict.get( 'type', 'unrestricted' ) @@ -154,7 +155,7 @@ # exist in the current Tool Shed, the category will not be created, so it will not be associated with # the repository. category_ids = [] - category_names = repository_archive_dict[ 'category_names' ] + category_names = repository_archive_dict.get( 'category_names', [] ) for category_name in category_names: category = suc.get_category_by_name( trans, category_name ) if category is None: @@ -182,8 +183,7 @@ else: # The repository either already exists in this Tool Shed or the current user is not authorized to create it. ok = True - results_message += 'Import not necessary: repository status for this Tool Shed is: %s.' % \ - str( repository_archive_dict[ 'status' ] ) + results_message += 'Import not necessary: repository status for this Tool Shed is: %s.' % str( status ) import_results_tups.append( ( ok, ( str( name ), str( username ) ), results_message ) ) return import_results_tups 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.