diff options
author | Lars Wirzenius <liw@liw.fi> | 2020-09-05 20:06:19 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2020-09-05 20:06:19 +0300 |
commit | af689d3b955fb3beecbb170c1d6fa6b6362c9829 (patch) | |
tree | be88e8288bece9d7cc6165a8ceabb0558ab1399d | |
parent | a76a135e92470b1ad5468900b5b2e6826d212280 (diff) | |
download | vmdb2-af689d3b955fb3beecbb170c1d6fa6b6362c9829.tar.gz |
fix(runcmd.py): creation of CalledProcessException object was buggy
-rw-r--r-- | vmdb/__init__.py | 9 | ||||
-rw-r--r-- | vmdb/runcmd.py | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/vmdb/__init__.py b/vmdb/__init__.py index 418d9f6..2bc32f2 100644 --- a/vmdb/__init__.py +++ b/vmdb/__init__.py @@ -28,7 +28,14 @@ from .step_list import ( StepKeyMissing, StepKeyWrongValueType, ) -from .runcmd import runcmd, runcmd_chroot, set_verbose_progress, progress, error +from .runcmd import ( + runcmd, + runcmd_chroot, + set_verbose_progress, + progress, + error, + RuncmdError, +) from .tags import ( Tags, UnknownTag, diff --git a/vmdb/runcmd.py b/vmdb/runcmd.py index ff6952f..67acde1 100644 --- a/vmdb/runcmd.py +++ b/vmdb/runcmd.py @@ -55,7 +55,7 @@ def runcmd(argv, **kwargs): logging.debug("STDOUT: %s", out.decode("UTF8")) logging.debug("STDERR: %s", err.decode("UTF8")) if p.returncode != 0: - raise subprocess.CalledProcessError("Command failed: {}".format(p.returncode)) + raise RuncmdError("Program failed: {}".format(p.returncode)) return out @@ -79,3 +79,7 @@ def _log_stdout(data): def _log_stderr(data): logging.debug("STDERR: %r", data) return data + + +class RuncmdError(Exception): + pass |