From ba8b7dc2d5429588c0d180548eae91d5a4512e89 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Thu, 2 Nov 2017 17:05:46 +0000
Subject: [PATCH] Adjust imcp/immv exit code management
---
fsl/scripts/imcp.py | 15 +++++++--------
fsl/scripts/immv.py | 14 +++++++-------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/fsl/scripts/imcp.py b/fsl/scripts/imcp.py
index 9b7129755..5f8367fd8 100755
--- a/fsl/scripts/imcp.py
+++ b/fsl/scripts/imcp.py
@@ -43,13 +43,15 @@ def main(argv=None):
argv = sys.argv[1:]
if len(argv) < 2:
- raise RuntimeError(usage)
+ print(usage)
+ return 1
srcs = argv[:-1]
dest = argv[ -1]
if len(srcs) > 1 and not op.isdir(dest):
- raise RuntimeError(usage)
+ print(usage)
+ return 1
srcs = fslpath.removeDuplicates(srcs,
allowedExts=fslimage.ALLOWED_EXTENSIONS,
@@ -58,11 +60,8 @@ def main(argv=None):
for src in srcs:
imcp.imcp(src, dest, useDefaultExt=True, overwrite=True)
+ return 0
-if __name__ == '__main__':
- try:
- main()
- except Exception as e:
- print(e)
- sys.exit(1)
+if __name__ == '__main__':
+ sys.exit(main())
diff --git a/fsl/scripts/immv.py b/fsl/scripts/immv.py
index 90a52f963..6a1397e2a 100755
--- a/fsl/scripts/immv.py
+++ b/fsl/scripts/immv.py
@@ -44,13 +44,15 @@ def main(argv=None):
argv = sys.argv[1:]
if len(argv) < 2:
- raise RuntimeError(usage)
+ print(usage)
+ return 1
srcs = argv[:-1]
dest = argv[ -1]
if len(srcs) > 1 and not op.isdir(dest):
- raise RuntimeError(usage)
+ print(usage)
+ return 1
srcs = fslpath.removeDuplicates(srcs,
allowedExts=fslimage.ALLOWED_EXTENSIONS,
@@ -59,10 +61,8 @@ def main(argv=None):
for src in srcs:
imcp.immv(src, dest, useDefaultExt=True, overwrite=True)
+ return 0
+
if __name__ == '__main__':
- try:
- main()
- except Exception as e:
- print(e)
- sys.exit(1)
+ sys.exit(main())
--
GitLab