[PATCH v2 02/17] Revert "wic: Introduce the `WicExecError` exception class"

[Henning Schild <henning.schild@siemens.com>]

This reverts commit 17f9196e0f2cb7e1952369fb79f156fc8a3c678d.

This was a workaround for a bug in fsck of debian. A later patch will
introduce this workaround outside of wic.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 scripts/lib/wic/partition.py  | 10 +++-------
 scripts/lib/wic/utils/misc.py | 17 +++--------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index c137a17..26be958 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -29,7 +29,7 @@ import os
 import tempfile
 
 from wic import WicError
-from wic.utils.misc import WicExecError, exec_cmd, get_bitbake_var
+from wic.utils.misc import exec_cmd, get_bitbake_var
 from wic.pluginbase import PluginMgr
 
 logger = logging.getLogger('wic')
@@ -253,12 +253,8 @@ class Partition():
             (self.fstype, extra_imagecmd, rootfs, label_str, rootfs_dir)
         exec_cmd(mkfs_cmd)
 
-        try:
-            mkfs_cmd = "fsck.%s -pvfD %s" % (self.fstype, rootfs)
-            exec_cmd(mkfs_cmd)
-        except WicExecError as e:
-            if e.returncode != 1:
-                raise e
+        mkfs_cmd = "fsck.%s -pvfD %s" % (self.fstype, rootfs)
+        exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo)
 
     def prepare_rootfs_btrfs(self, rootfs, oe_builddir, rootfs_dir):
         """
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py
index b3a619d..4609984 100644
--- a/scripts/lib/wic/utils/misc.py
+++ b/scripts/lib/wic/utils/misc.py
@@ -59,16 +59,6 @@ NATIVE_RECIPES = {"bmaptool": "bmap-tools",
                   "syslinux": "syslinux"
                  }
 
-class WicExecError(WicError):
-    def __init__(self, command, output, returncode):
-        self.command = command
-        self.output = output
-        self.returncode = returncode
-
-    def __str__(self):
-        return "_exec_cmd: %s returned '%s' instead of 0\noutput: %s" % \
-            (self.command, self.returncode, self.output)
-
 def _exec_cmd(cmd_and_args, as_shell=False):
     """
     Execute command, catching stderr, stdout
@@ -79,18 +69,17 @@ def _exec_cmd(cmd_and_args, as_shell=False):
     args = cmd_and_args.split()
     logger.debug(args)
 
-    cmd = args
     if as_shell:
-        cmd = cmd_and_args
         ret, out = runner.runtool(cmd_and_args)
     else:
         ret, out = runner.runtool(args)
     out = out.strip()
     if ret != 0:
-        raise WicExecError(cmd, out, ret)
+        raise WicError("_exec_cmd: %s returned '%s' instead of 0\noutput: %s" % \
+                       (cmd_and_args, ret, out))
 
     logger.debug("_exec_cmd: output for %s (rc = %d): %s",
-                 cmd_and_args, out, ret)
+                 cmd_and_args, ret, out)
 
     return ret, out
 
-- 
2.16.1