2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e79a60e7c67a/ Changeset: e79a60e7c67a Branch: stable User: greg Date: 2013-06-12 15:50:21 Summary: Fix for getting potential readme files included (or not) in repositories being installed or reinstalled. Affected #: 1 file diff -r f8cf776ff12f480ff0be89bc7b92c0e9c7658b0e -r e79a60e7c67a68279c2c976ada9ddaa1095fadb4 lib/galaxy/webapps/tool_shed/controllers/repository.py --- a/lib/galaxy/webapps/tool_shed/controllers/repository.py +++ b/lib/galaxy/webapps/tool_shed/controllers/repository.py @@ -1526,8 +1526,13 @@ repository_owner = kwd[ 'owner' ] changeset_revision = kwd[ 'changeset_revision' ] repository = suc.get_repository_by_name_and_owner( trans.app, repository_name, repository_owner ) - repository_metadata = suc.get_repository_metadata_by_changeset_revision( trans, trans.security.encode_id( repository.id ), changeset_revision ) - return readme_util.build_readme_files_dict( repository_metadata.metadata ) + if repository: + repository_metadata = suc.get_repository_metadata_by_changeset_revision( trans, trans.security.encode_id( repository.id ), changeset_revision ) + if repository_metadata: + metadata = repository_metadata.metadata + if metadata: + return readme_util.build_readme_files_dict( repository_metadata.metadata ) + return {} @web.json def get_repository_dependencies( self, trans, **kwd ): https://bitbucket.org/galaxy/galaxy-central/commits/6f729c8cdd63/ Changeset: 6f729c8cdd63 User: greg Date: 2013-06-12 15:50:43 Summary: Merged from stable Affected #: 1 file diff -r 7228f6784623ccf84fe125918aa9b88a4336e481 -r 6f729c8cdd63095f7a3e0d63f41704a73621454f lib/galaxy/webapps/tool_shed/controllers/repository.py --- a/lib/galaxy/webapps/tool_shed/controllers/repository.py +++ b/lib/galaxy/webapps/tool_shed/controllers/repository.py @@ -1516,8 +1516,13 @@ repository_owner = kwd[ 'owner' ] changeset_revision = kwd[ 'changeset_revision' ] repository = suc.get_repository_by_name_and_owner( trans.app, repository_name, repository_owner ) - repository_metadata = suc.get_repository_metadata_by_changeset_revision( trans, trans.security.encode_id( repository.id ), changeset_revision ) - return readme_util.build_readme_files_dict( repository_metadata.metadata ) + if repository: + repository_metadata = suc.get_repository_metadata_by_changeset_revision( trans, trans.security.encode_id( repository.id ), changeset_revision ) + if repository_metadata: + metadata = repository_metadata.metadata + if metadata: + return readme_util.build_readme_files_dict( repository_metadata.metadata ) + return {} @web.json def get_repository_dependencies( self, trans, **kwd ): 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.