From 34c95acca050b15ff0401bead827dfdb9ea4f395 Mon Sep 17 00:00:00 2001 From: Jeremy Goecks Date: Thu, 22 Mar 2012 09:58:42 -0400 Subject: [PATCH] Convert dbkeys from string to dict before checking for dbkey when including chrom info in jobs. Thanks Andrew Warren. --- lib/galaxy/tools/actions/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tools/actions/__init__.py b/lib/galaxy/tools/actions/__init__.py index a51330524a3..1b1a4757912 100644 --- a/lib/galaxy/tools/actions/__init__.py +++ b/lib/galaxy/tools/actions/__init__.py @@ -195,7 +195,7 @@ class DefaultToolAction( object ): else: # For custom builds, chrom info resides in converted dataset; for built-in builds, chrom info resides in tool-data/shared. chrom_info = None - if trans.user and ( 'dbkeys' in trans.user.preferences ) and ( input_dbkey in trans.user.preferences[ 'dbkeys' ] ): + if trans.user and ( 'dbkeys' in trans.user.preferences ) and ( input_dbkey in from_json_string( trans.user.preferences[ 'dbkeys' ] ) ): # Custom build. custom_build_dict = from_json_string( trans.user.preferences[ 'dbkeys' ] )[ input_dbkey ] if 'fasta' in custom_build_dict: