diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-02-14 22:21:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-04 23:18:17 +0000 |
commit | f5ae79da406190bf27194d7cecf15926bbb6ef20 (patch) | |
tree | 8f745825923833393a896c3a084e42cd3f184528 /scripts/lib/wic/utils/misc.py | |
parent | 3d47a212a627af50c78099eaf7308a6d38aaf1b3 (diff) | |
download | poky-f5ae79da406190bf27194d7cecf15926bbb6ef20.tar.gz |
wic: raise WicError in core modules
Replaced sys.exit with raising WicError in the core wic modules.
(From OE-Core rev: 1b11437fb25ece5b3eede52344b071e875fa738f)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/utils/misc.py')
-rw-r--r-- | scripts/lib/wic/utils/misc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py index b7b835afbb..94fdab2669 100644 --- a/scripts/lib/wic/utils/misc.py +++ b/scripts/lib/wic/utils/misc.py | |||
@@ -33,6 +33,7 @@ import re | |||
33 | from collections import defaultdict | 33 | from collections import defaultdict |
34 | from distutils import spawn | 34 | from distutils import spawn |
35 | 35 | ||
36 | from wic.errors import WicError | ||
36 | from wic.utils import runner | 37 | from wic.utils import runner |
37 | 38 | ||
38 | logger = logging.getLogger('wic') | 39 | logger = logging.getLogger('wic') |
@@ -74,9 +75,8 @@ def _exec_cmd(cmd_and_args, as_shell=False, catch=3): | |||
74 | ret, out = runner.runtool(args, catch) | 75 | ret, out = runner.runtool(args, catch) |
75 | out = out.strip() | 76 | out = out.strip() |
76 | if ret != 0: | 77 | if ret != 0: |
77 | logger.error("_exec_cmd: %s returned '%s' instead of 0\noutput: %s" % \ | 78 | raise WicError("_exec_cmd: %s returned '%s' instead of 0\noutput: %s" % \ |
78 | (cmd_and_args, ret, out)) | 79 | (cmd_and_args, ret, out)) |
79 | sys.exit(1) | ||
80 | 80 | ||
81 | logger.debug("_exec_cmd: output for %s (rc = %d): %s", | 81 | logger.debug("_exec_cmd: output for %s (rc = %d): %s", |
82 | cmd_and_args, ret, out) | 82 | cmd_and_args, ret, out) |