Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 17da51abdc61e9fb1e3f76b36316c9dbf3c836e6 https://github.com/galaxyproject/galaxy/commit/17da51abdc61e9fb1e3f76b36316c... Author: Peter Cock p.j.a.cock@googlemail.com Date: 2016-10-25 (Tue, 25 Oct 2016)

Changed paths: M lib/galaxy/tools/data/__init__.py

Log Message: ----------- Include filenames in loc file DEBUG lines

This will help debugging where multiple (possibly conflicting) ``*.loc`` files come from, e.g.

``` galaxy.tools.data DEBUG 2016-10-25 18:34:50,841 Loaded tool data table 'blastdb_p' galaxy.tools.data DEBUG 2016-10-25 18:34:51,356 Loaded tool data table 'blastdb' galaxy.tools.data DEBUG 2016-10-25 18:34:51,359 Loading another instance of data table 'blastdb_p', attempting to merge content. galaxy.tools.data DEBUG 2016-10-25 18:34:51,375 Loaded tool data table 'blastdb_d' ```

Evidently I may have at least two copies of ``blastdb_p.loc``, but where are they?

Commit: 35346fdb3e6764b14ae3359fb9ea31c03d932ea0 https://github.com/galaxyproject/galaxy/commit/35346fdb3e6764b14ae3359fb9ea3... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-10-26 (Wed, 26 Oct 2016)

Changed paths: M lib/galaxy/tools/data/__init__.py

Log Message: ----------- Merge pull request #3095 from peterjc/patch-4

Include filenames in loc file DEBUG lines

Compare: https://github.com/galaxyproject/galaxy/compare/8da4ad6563f2...35346fdb3e67