exit with final command's status code

Author: joernhees

userdocker/helpers/execute.py

@@ -36,3 +36,7 @@ def exec_cmd(cmd, dry_run=False, return_status=True, loglvl=logging.INFO):
     except subprocess.CalledProcessError as e:
         ret = e.returncode
         sys.exit(ret)
+
+
+def exit_exec_cmd(cmd, dry_run=False):
+    sys.exit(exec_cmd(cmd, dry_run=dry_run))

userdocker/subcommands/attach.py

@@ -6,7 +6,7 @@
 from ..config import uid
 from ..helpers.cmd import init_cmd
 from ..helpers.exceptions import UserDockerException
-from ..helpers.execute import exec_cmd
+from ..helpers.execute import exit_exec_cmd
 from ..helpers.logger import logger
 from ..helpers.parser import init_subcommand_parser
 
@@ -63,4 +63,4 @@ def exec_cmd_attach(args):
             'denied!' % (container, userdocker_uid, uid)
         )
 
-    exec_cmd(cmd, dry_run=args.dry_run)
+    exit_exec_cmd(cmd, dry_run=args.dry_run)

userdocker/subcommands/dockviz.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from ..helpers.execute import exec_cmd
+from ..helpers.execute import exit_exec_cmd
 
 
 def exec_cmd_dockviz(args):
@@ -10,4 +10,4 @@ def exec_cmd_dockviz(args):
         "-v", "/var/run/docker.sock:/var/run/docker.sock",
         "nate/dockviz", "images", "--tree"
     ]
-    exec_cmd(cmd, dry_run=args.dry_run)
+    exit_exec_cmd(cmd, dry_run=args.dry_run)

userdocker/subcommands/images.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from ..helpers.cmd import init_cmd
-from ..helpers.execute import exec_cmd
+from ..helpers.execute import exit_exec_cmd
 from ..helpers.parser import init_subcommand_parser
 
 
@@ -20,4 +20,4 @@ def exec_cmd_images(args):
     if args.repo_tag:
         cmd.append("--")
         cmd.append(args.repo_tag)
-    exec_cmd(cmd, dry_run=args.dry_run)
+    exit_exec_cmd(cmd, dry_run=args.dry_run)

userdocker/subcommands/ps.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from ..helpers.cmd import init_cmd
-from ..helpers.execute import exec_cmd
+from ..helpers.execute import exit_exec_cmd
 from ..helpers.nvidia import nvidia_get_available_gpus
 from ..helpers.nvidia import nvidia_get_gpus_used_by_containers
 from ..helpers.parser import init_subcommand_parser
@@ -25,8 +25,7 @@ def parser_ps(parser):
 
 def exec_cmd_ps(args):
     if not args.gpu_used and not args.gpu_free:
-        exec_cmd(init_cmd(args), dry_run=args.dry_run)
-        return
+        exit_exec_cmd(init_cmd(args), dry_run=args.dry_run)
 
     if args.gpu_used:
         gpus_used = nvidia_get_gpus_used_by_containers(args.executor_path)

userdocker/subcommands/pull.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from ..helpers.cmd import init_cmd
-from ..helpers.execute import exec_cmd
+from ..helpers.execute import exit_exec_cmd
 from ..helpers.parser import init_subcommand_parser
 
 
@@ -19,4 +19,4 @@ def exec_cmd_pull(args):
     if args.name_tag_digest:
         cmd.append("--")
         cmd.append(args.name_tag_digest)
-    exec_cmd(cmd, dry_run=args.dry_run)
+    exit_exec_cmd(cmd, dry_run=args.dry_run)

userdocker/subcommands/run.py

@@ -28,6 +28,7 @@
 from ..helpers.cmd import init_cmd
 from ..helpers.exceptions import UserDockerException
 from ..helpers.execute import exec_cmd
+from ..helpers.execute import exit_exec_cmd
 from ..helpers.logger import logger
 from ..helpers.nvidia import nvidia_get_available_gpus
 from ..helpers.parser import init_subcommand_parser
@@ -286,4 +287,4 @@ def exec_cmd_run(args):
     cmd.append(img)
     cmd.extend(args.image_args)
 
-    exec_cmd(cmd, dry_run=args.dry_run)
+    exit_exec_cmd(cmd, dry_run=args.dry_run)

userdocker/subcommands/version.py

@@ -2,9 +2,9 @@
 
 from .. import __version__
 from ..helpers.cmd import init_cmd
-from ..helpers.execute import exec_cmd
+from ..helpers.execute import exit_exec_cmd
 
 
 def exec_cmd_version(args):
     print("Userdocker Version: %s\n" % __version__)
-    exec_cmd(init_cmd(args), dry_run=args.dry_run)
+    exit_exec_cmd(init_cmd(args), dry_run=args.dry_run)

userdocker/userdocker.py

@@ -9,7 +9,7 @@
 
 from .helpers.cmd import init_cmd
 from .helpers.exceptions import UserDockerException
-from .helpers.execute import exec_cmd
+from .helpers.execute import exit_exec_cmd
 from .parser import parse_args
 from .subcommands import specific_command_executors
 
@@ -24,7 +24,7 @@ def prepare_and_exec_cmd(args):
     if scmd in specific_command_executors:
         specific_command_executors[scmd](args)
     else:
-        exec_cmd(init_cmd(args), dry_run=args.dry_run)
+        exit_exec_cmd(init_cmd(args), dry_run=args.dry_run)
 
 
 def parse_and_exec_cmd():