From 496ea672a289d88d6daa837240e2bcd798459fb6 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Thu, 2 Nov 2017 17:58:00 +0000
Subject: [PATCH] RF: Further adjustments to immv/imcp exit code handling

---
 fsl/scripts/imcp.py | 16 +++++++++++-----
 fsl/scripts/immv.py | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/fsl/scripts/imcp.py b/fsl/scripts/imcp.py
index 5f8367fd8..8bf15ba23 100755
--- a/fsl/scripts/imcp.py
+++ b/fsl/scripts/imcp.py
@@ -53,12 +53,18 @@ def main(argv=None):
         print(usage)
         return 1
 
-    srcs = fslpath.removeDuplicates(srcs,
-                                    allowedExts=fslimage.ALLOWED_EXTENSIONS,
-                                    fileGroups=fslimage.FILE_GROUPS)
+    try:
+        srcs = fslpath.removeDuplicates(
+            srcs,
+            allowedExts=fslimage.ALLOWED_EXTENSIONS,
+            fileGroups=fslimage.FILE_GROUPS)
 
-    for src in srcs:
-        imcp.imcp(src, dest, useDefaultExt=True, overwrite=True)
+        for src in srcs:
+            imcp.imcp(src, dest, useDefaultExt=True, overwrite=True)
+
+    except Exception as e:
+        print(str(e))
+        return 1
 
     return 0
 
diff --git a/fsl/scripts/immv.py b/fsl/scripts/immv.py
index 6a1397e2a..b33d8ff7b 100755
--- a/fsl/scripts/immv.py
+++ b/fsl/scripts/immv.py
@@ -54,12 +54,18 @@ def main(argv=None):
         print(usage)
         return 1
 
-    srcs = fslpath.removeDuplicates(srcs,
-                                    allowedExts=fslimage.ALLOWED_EXTENSIONS,
-                                    fileGroups=fslimage.FILE_GROUPS)
+    try:
+        srcs = fslpath.removeDuplicates(
+            srcs,
+            allowedExts=fslimage.ALLOWED_EXTENSIONS,
+            fileGroups=fslimage.FILE_GROUPS)
 
-    for src in srcs:
-        imcp.immv(src, dest, useDefaultExt=True, overwrite=True)
+        for src in srcs:
+            imcp.immv(src, dest, useDefaultExt=True, overwrite=True)
+
+    except Exception as e:
+        print(str(e))
+        return 1
 
     return 0
 
-- 
GitLab