Merge pull request #109 from galaxyproject/catch_errors

catch error during conda search

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,
@@ -503,10 +504,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 CommandLineException:
+        log.error("Could not execute: '%s'", search_cmd)
+        hits = []
 
     if len(hits) == 0:
         return (None, None)