From 331db3ab818292057af3c39e18bd76d654d9fab5 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 16 Aug 2016 12:01:23 -0400 Subject: [PATCH] 9783: Report useful error if subdirectory of a collection doesn't exist or isn't a directory. --- sdk/cwl/arvados_cwl/fsaccess.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py index 0970e72d71..ae4532bec8 100644 --- a/sdk/cwl/arvados_cwl/fsaccess.py +++ b/sdk/cwl/arvados_cwl/fsaccess.py @@ -1,5 +1,6 @@ import fnmatch import os +import errno import cwltool.stdfsaccess from cwltool.pathmapper import abspath @@ -96,6 +97,10 @@ class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess): dir = collection.find(rest) else: dir = collection + if dir is None: + raise IOError(errno.ENOENT, "Directory '%s' in '%s' not found" % (rest, collection.portable_data_hash())) + if not isinstance(dir, arvados.collection.Collection): + raise IOError(errno.ENOENT, "Path '%s' in '%s' is not a Directory" % (rest, collection.portable_data_hash())) return [abspath(l, fn) for l in dir.keys()] else: return super(CollectionFsAccess, self).listdir(fn) -- 2.30.2