1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2d64260eb6e3/ Changeset: 2d64260eb6e3 User: Dave Bouvier Date: 2013-08-19 17:49:49 Summary: Fix for exporting a repository that depends on a repository that has unicode characters in the description or long description. Affected #: 2 files diff -r 778b6f7e338af5458abf1e54eaf20eefa17ef50b -r 2d64260eb6e31a992b78d82ee50f351bc3b95d07 lib/tool_shed/galaxy_install/repository_util.py --- a/lib/tool_shed/galaxy_install/repository_util.py +++ b/lib/tool_shed/galaxy_install/repository_util.py @@ -83,8 +83,8 @@ requirements_dict[ 'changeset_revision' ] = changeset_revision new_tool_dependencies[ dependency_key ] = requirements_dict tool_dependencies = new_tool_dependencies - # Cast unicode to string. - repo_info_dict[ str( repository.name ) ] = ( str( repository.description ), + # Cast unicode to string, with the exception of description, since it is free text and can contain special characters. + repo_info_dict[ str( repository.name ) ] = ( repository.description, str( repository_clone_url ), str( changeset_revision ), str( ctx_rev ), diff -r 778b6f7e338af5458abf1e54eaf20eefa17ef50b -r 2d64260eb6e31a992b78d82ee50f351bc3b95d07 lib/tool_shed/util/export_util.py --- a/lib/tool_shed/util/export_util.py +++ b/lib/tool_shed/util/export_util.py @@ -243,8 +243,9 @@ attributes[ 'type' ] = str( repository.type ) # We have to associate the public username since the user_id will be different between tool sheds. attributes[ 'username' ] = str( repository.user.username ) - sub_elements[ 'description' ] = str( repository.description ) - sub_elements[ 'long_description' ] = str( repository.long_description ) + # Don't coerce description or long description from unicode to string because the fields are free text. + sub_elements[ 'description' ] = repository.description + sub_elements[ 'long_description' ] = repository.long_description sub_elements[ 'archive' ] = archive_name # Keep track of Category associations. categories = [] 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.