From 04da969d5365d88cd357f653834fdf27c37ba801 Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Sun, 6 May 2018 13:13:24 +0200 Subject: [PATCH 1/2] catch error during conda search --- galaxy/tools/deps/conda_util.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/galaxy/tools/deps/conda_util.py b/galaxy/tools/deps/conda_util.py index f98603c..a7bbad2 100644 --- a/galaxy/tools/deps/conda_util.py +++ b/galaxy/tools/deps/conda_util.py @@ -503,10 +503,14 @@ def best_search_result(conda_target, conda_context, channels_override=None, offl else: search_cmd.extend(conda_context._override_channels_args) search_cmd.append(conda_target.package) - res = commands.execute(search_cmd) - res = unicodify(res) - hits = json.loads(res).get(conda_target.package, []) - hits = sorted(hits, key=lambda hit: packaging.version.parse(hit['version']), reverse=True) + try: + res = commands.execute(search_cmd) + res = unicodify(res) + hits = json.loads(res).get(conda_target.package, []) + hits = sorted(hits, key=lambda hit: packaging.version.parse(hit['version']), reverse=True) + except: + log.error("Could not execute: '%s'", search_cmd) + hits = [] if len(hits) == 0: return (None, None) From de40459615a148fda7517ace4934e10edcbedc64 Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Sun, 6 May 2018 13:46:52 +0200 Subject: [PATCH 2/2] catch real Exception --- galaxy/tools/deps/conda_util.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/galaxy/tools/deps/conda_util.py b/galaxy/tools/deps/conda_util.py index a7bbad2..930ff02 100644 --- a/galaxy/tools/deps/conda_util.py +++ b/galaxy/tools/deps/conda_util.py @@ -12,6 +12,7 @@ import six from six.moves import shlex_quote +from galaxy.tools.deps.commands import CommandLineException from galaxy.util import unicodify from . import ( commands, @@ -508,7 +509,7 @@ def best_search_result(conda_target, conda_context, channels_override=None, offl res = unicodify(res) hits = json.loads(res).get(conda_target.package, []) hits = sorted(hits, key=lambda hit: packaging.version.parse(hit['version']), reverse=True) - except: + except CommandLineException: log.error("Could not execute: '%s'", search_cmd) hits = []