1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/7eeee803345e/ changeset: 7eeee803345e user: dan date: 2012-08-22 17:40:55 summary: Better handling of invalid dynamic external display application links. affected #: 1 file diff -r 9df126526d89979a7830bc48c7bff122555eaea9 -r 7eeee803345e111b9485cc9b9c2b397a6623fa5f lib/galaxy/datatypes/display_applications/application.py --- a/lib/galaxy/datatypes/display_applications/application.py +++ b/lib/galaxy/datatypes/display_applications/application.py @@ -98,8 +98,10 @@ for line in open( filename ): if not skip_startswith or not line.startswith( skip_startswith ): line = line.rstrip( '\n\r' ) + if not line: + continue fields = line.split( separator ) - if len( fields ) >= max_col: + if len( fields ) > max_col: new_elem = deepcopy( elem ) new_elem.set( 'id', fields[id_col] ) new_elem.set( 'name', fields[name_col] ) @@ -111,6 +113,8 @@ dynamic_values[key] = value #now populate rval.append( DisplayApplicationLink.from_elem( new_elem, display_application, other_values = dynamic_values ) ) + else: + log.warning( 'Invalid dynamic display application link specified in %s: "%s"' % ( filename, line ) ) self.links = rval def __iter__( self ): return iter( self.links ) 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.