3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/200bd6479490/ Changeset: 200bd6479490 User: Dave Bouvier Date: 2013-10-24 14:51:16 Summary: Check for the existence of a display application before attempting to delete it from the registry. Affected #: 1 file diff -r e5b91a357c909cb63b5bbb7fc922226f34255d31 -r 200bd6479490cb7c85e18e95beb5a1cb072af307 lib/galaxy/datatypes/registry.py --- a/lib/galaxy/datatypes/registry.py +++ b/lib/galaxy/datatypes/registry.py @@ -547,8 +547,11 @@ display_app.id = tool_dict[ 'guid' ] break if deactivate: - del self.display_applications[ display_app.id ] - del self.datatypes_by_extension[ extension ].display_applications[ display_app.id ] + if display_app.id in self.display_applications: + del self.display_applications[ display_app.id ] + if extension in self.datatypes_by_extension: + if display_app.id in self.datatypes_by_extension[ extension ].display_applications: + del self.datatypes_by_extension[ extension ].display_applications[ display_app.id ] if inherit and ( self.datatypes_by_extension[ extension ], display_app ) in self.inherit_display_application_by_class: self.inherit_display_application_by_class.remove( ( self.datatypes_by_extension[ extension ], display_app ) ) self.log.debug( "Deactivated display application '%s' for datatype '%s'." % ( display_app.id, extension ) ) https://bitbucket.org/galaxy/galaxy-central/commits/71c35dbde130/ Changeset: 71c35dbde130 Branch: next-stable User: Dave Bouvier Date: 2013-10-24 14:51:16 Summary: Check for the existence of a display application before attempting to delete it from the registry. Affected #: 1 file diff -r 434254daaa091f4b9999e015ff090da518327a13 -r 71c35dbde130994265d85c34a00d9f845eda28cc lib/galaxy/datatypes/registry.py --- a/lib/galaxy/datatypes/registry.py +++ b/lib/galaxy/datatypes/registry.py @@ -547,8 +547,11 @@ display_app.id = tool_dict[ 'guid' ] break if deactivate: - del self.display_applications[ display_app.id ] - del self.datatypes_by_extension[ extension ].display_applications[ display_app.id ] + if display_app.id in self.display_applications: + del self.display_applications[ display_app.id ] + if extension in self.datatypes_by_extension: + if display_app.id in self.datatypes_by_extension[ extension ].display_applications: + del self.datatypes_by_extension[ extension ].display_applications[ display_app.id ] if inherit and ( self.datatypes_by_extension[ extension ], display_app ) in self.inherit_display_application_by_class: self.inherit_display_application_by_class.remove( ( self.datatypes_by_extension[ extension ], display_app ) ) self.log.debug( "Deactivated display application '%s' for datatype '%s'." % ( display_app.id, extension ) ) https://bitbucket.org/galaxy/galaxy-central/commits/319c21e395a3/ Changeset: 319c21e395a3 User: Dave Bouvier Date: 2013-10-24 14:55:55 Summary: Merge with next-stable. Affected #: 0 files 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.