Merge branch '9865-cwl-fix-ignored-exceptions'
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Thu, 28 Feb 2019 20:33:38 +0000 (15:33 -0500)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Thu, 28 Feb 2019 20:33:38 +0000 (15:33 -0500)
refs #9865

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

1  2 
sdk/cwl/arvados_cwl/runner.py

index c0d165aa9eed4e5cbaeaf9d365a302957a3921b1,65bce95f78c6742de94f230274e28dfd9316e093..e515ac2ce5e99f4ec75011b8ac51bfe2fc1bbff8
@@@ -7,19 -7,15 +7,19 @@@ standard_library.install_aliases(
  from future.utils import  viewvalues, viewitems
  
  import os
 +import sys
  import urllib.parse
  from functools import partial
  import logging
  import json
 -import subprocess32 as subprocess
  from collections import namedtuple
 -
  from io import StringIO
  
 +if os.name == "posix" and sys.version_info[0] < 3:
 +    import subprocess32 as subprocess
 +else:
 +    import subprocess
 +
  from schema_salad.sourceline import SourceLine, cmap
  
  from cwltool.command_line_tool import CommandLineTool
@@@ -478,8 -474,8 +478,8 @@@ class Runner(Process)
                      fileobj["location"] = "keep:%s/%s" % (record["output"], path)
              adjustFileObjs(outputs, keepify)
              adjustDirObjs(outputs, keepify)
-         except Exception as e:
-             logger.exception("[%s] While getting final output object: %s", self.name, e)
+         except Exception:
+             logger.exception("[%s] While getting final output object", self.name)
              self.arvrunner.output_callback({}, "permanentFail")
          else:
              self.arvrunner.output_callback(outputs, processStatus)