commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6f9059801faf/ Changeset: 6f9059801faf Branch: stable User: greg Date: 2014-02-14 16:40:31 Summary: Change log.warning to log.debug for messages regarding conflicting datatypes since recent changes in the Galaxy framework now result in job errors when using log.warning. Affected #: 1 file diff -r e088f2dc8b070d13e9fb7319463786d7ff4f5024 -r 6f9059801fafb3b7ae2cf844b07848beab0846fa lib/galaxy/datatypes/registry.py --- a/lib/galaxy/datatypes/registry.py +++ b/lib/galaxy/datatypes/registry.py @@ -223,7 +223,7 @@ if extension in self.datatypes_by_extension: # Because of the way that the value of can_process_datatype was set above, we know that the value of # override is True. - self.log.warning( "Overriding conflicting datatype with extension '%s', using datatype from %s." % \ + self.log.debug( "Overriding conflicting datatype with extension '%s', using datatype from %s." % \ ( str( extension ), str( config ) ) ) if make_subclass: datatype_class = type( datatype_class_name, ( datatype_class, ), {} ) @@ -277,7 +277,7 @@ if not override: # Do not load the datatype since it conflicts with an existing datatype which we are not supposed # to override. - self.log.warning( "Ignoring conflicting datatype with extension '%s' from %s." % ( extension, config ) ) + self.log.debug( "Ignoring conflicting datatype with extension '%s' from %s." % ( extension, config ) ) # Load datatype sniffers from the config - we'll do this even if one or more datatypes were not properly processed in the config # since sniffers are not tightly coupled with datatypes. self.load_datatype_sniffers( root, https://bitbucket.org/galaxy/galaxy-central/commits/b71c9af7c17c/ Changeset: b71c9af7c17c User: inithello Date: 2014-02-14 16:43:10 Summary: Merge grafted bugfix from 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.
participants (1)
-
commits-noreply@bitbucket.org