Skip to content

Commit

Permalink
Merge pull request #3095 from peterjc/patch-4
Browse files Browse the repository at this point in the history
Include filenames in loc file DEBUG lines
  • Loading branch information
dannon authored Oct 26, 2016
2 parents 8da4ad6 + 17da51a commit 35346fd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/galaxy/tools/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ def load_from_config_file( self, config_filename, tool_data_path, from_shed_conf
table_elems.append( table_elem )
if table.name not in self.data_tables:
self.data_tables[ table.name ] = table
log.debug( "Loaded tool data table '%s'", table.name )
log.debug( "Loaded tool data table '%s' from file '%s'", table.name, filename )
else:
log.debug( "Loading another instance of data table '%s', attempting to merge content.", table.name )
log.debug( "Loading another instance of data table '%s' from file '%s', attempting to merge content.", table.name, filename )
self.data_tables[ table.name ].merge_tool_data_table( table, allow_duplicates=False ) # only merge content, do not persist to disk, do not allow duplicate rows when merging
# FIXME: This does not account for an entry with the same unique build ID, but a different path.
return table_elems
Expand Down

0 comments on commit 35346fd

Please sign in to comment.