diff options
Diffstat (limited to 'scripts/lib/wic/utils')
| -rw-r--r-- | scripts/lib/wic/utils/misc.py | 9 | ||||
| -rw-r--r-- | scripts/lib/wic/utils/partitionedfs.py | 7 |
2 files changed, 6 insertions, 10 deletions
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py index 6781d8381a..edb9c5b484 100644 --- a/scripts/lib/wic/utils/misc.py +++ b/scripts/lib/wic/utils/misc.py @@ -77,18 +77,15 @@ def _exec_cmd(cmd_and_args, as_shell=False, catch=3): msger.debug("_exec_cmd: output for %s (rc = %d): %s" % \ (cmd_and_args, ret, out)) - return (ret, out) + return ret, out def exec_cmd(cmd_and_args, as_shell=False, catch=3): """ - Execute command, catching stderr, stdout - - Exits if rc non-zero + Execute command, return output """ - ret, out = _exec_cmd(cmd_and_args, as_shell, catch) + return _exec_cmd(cmd_and_args, as_shell, catch)[1] - return out def exec_native_cmd(cmd_and_args, native_sysroot, catch=3, pseudo=""): """ diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py index eb4d7e6a51..5fc5765d65 100644 --- a/scripts/lib/wic/utils/partitionedfs.py +++ b/scripts/lib/wic/utils/partitionedfs.py @@ -21,7 +21,7 @@ import os from wic import msger from wic.utils.errors import ImageError -from wic.utils.misc import exec_cmd, exec_native_cmd +from wic.utils.misc import exec_native_cmd from wic.filemap import sparse_copy # Overhead of the MBR partitioning scheme (just one sector) @@ -350,10 +350,9 @@ class Image(): if self.disks: for dev in self.disks: disk = self.disks[dev] - try: + if hasattr(disk['disk'], 'cleanup'): disk['disk'].cleanup() - except: - pass + # remove partition images for image in self.partimages: if os.path.isfile(image): |