Merge branch 'master' into 4717-read-only-keep-services-flag

[arvados.git] / crunch_scripts / crunchutil / vwd.py

diff --git a/crunch_scripts/crunchutil/vwd.py b/crunch_scripts/crunchutil/vwd.py
index 5e6f1bec633c01e3124013ebd9a251d1b667a985..ca4116d7cee9015cbeb03bfaaf3ea4ca7dadfe03 100644 (file)
--- a/crunch_scripts/crunchutil/vwd.py
+++ b/crunch_scripts/crunchutil/vwd.py
@@ -56,7 +56,7 @@ def checkin(target_dir):
 
     logger = logging.getLogger("arvados")
 
-    caught_error = False
+    last_error = None
     for root, dirs, files in os.walk(target_dir):
         for f in files:
             try:
@@ -92,6 +92,6 @@ def checkin(target_dir):
                                 dat = reader.read(64*1024)
             except (IOError, OSError) as e:
                 logger.error(e)
-                caught_error = True
+                last_error = e
 
-    return (outputcollection, caught_error)
+    return (outputcollection, last_error)