From e878d8ac5da95caa83a9ad603ee13fee6eb36d72 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Mon, 19 May 2014 17:47:20 -0400 Subject: [PATCH] Fix get_chrom_info to take (and use) the tool in question. --- lib/galaxy/tools/actions/__init__.py | 2 +- lib/galaxy/util/dbkeys.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/tools/actions/__init__.py b/lib/galaxy/tools/actions/__init__.py index f8c4690d7e7..1160b05620c 100644 --- a/lib/galaxy/tools/actions/__init__.py +++ b/lib/galaxy/tools/actions/__init__.py @@ -193,7 +193,7 @@ class DefaultToolAction( object ): # Collect chromInfo dataset and add as parameters to incoming db_datasets = {} - ( chrom_info, db_dataset ) = trans.app.genome_builds.get_chrom_info( input_dbkey, trans=trans ) + ( chrom_info, db_dataset ) = trans.app.genome_builds.get_chrom_info( input_dbkey, tool, trans=trans ) if db_dataset: inp_data.update( { "chromInfo": db_dataset } ) incoming[ "chromInfo" ] = chrom_info diff --git a/lib/galaxy/util/dbkeys.py b/lib/galaxy/util/dbkeys.py index 3a6baef8606..075a830df54 100644 --- a/lib/galaxy/util/dbkeys.py +++ b/lib/galaxy/util/dbkeys.py @@ -2,7 +2,7 @@ Functionality for dealing with dbkeys. """ #dbkeys read from disk using builds.txt -from galaxy.util import dbnames, galaxy_directory +from galaxy.util import dbnames from galaxy.util.json import from_json_string from galaxy.util.odict import odict import os.path @@ -44,7 +44,7 @@ class GenomeBuilds( object ): rval.append( ( key, "%s (%s) [Custom]" % ( chrom_dict['name'], key ) ) ) return rval - def get_chrom_info( self, dbkey, trans=None ): + def get_chrom_info( self, dbkey, tool, trans=None ): chrom_info = None db_dataset = None # Collect chromInfo from custom builds