From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6517147827419742208 X-Received: by 10.223.184.131 with SMTP id i3mr1312658wrf.29.1517391723305; Wed, 31 Jan 2018 01:42:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.202.2 with SMTP id a2ls978321wmg.8.canary-gmail; Wed, 31 Jan 2018 01:42:02 -0800 (PST) X-Google-Smtp-Source: AH8x227AzUxMOkpIDf6mqrle+HHFjl2HTxVjzmieeuF8JR0nRpRMyq5BIy+lQdW7mHOb8d2LxkE5 X-Received: by 10.223.144.49 with SMTP id h46mr3063459wrh.8.1517391722908; Wed, 31 Jan 2018 01:42:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517391722; cv=none; d=google.com; s=arc-20160816; b=rJN58Qu/zSAZFt/sNDvFkgZB1B/wmIb51bCg2QKVejPbesEcEFrScKWn2yak3ypYbq BcDDc+/0cB1lLD5VUQrHDXZLWYdG/AHLjwk0RZIBc2RCTg5gCiu1m2m3DYfpF++ZF4lb gmNadkWfKGYEsdXsWeIVSyhZykSpp1T7MD+zODVRhfg3mD+pHKKx67LcT48yHuAgYn/U vGeLsJ9f44BRhZmdy/akcbDccolypqIS0cue/WxLN0U1oPcAyUYPSyk3ITm1cYQUpN1i MSnU13rOhTLLGISS5v0TK7C4Cx8vJf4zyrh5a1XDz3t/FiiVTO/x7el3bd933JtWF610 3/6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=AZZ3/8DwdNiOGdvjIHXmIImbj3VDh243x0y/IssdJMQ=; b=aSsFTzg/7XnHHeCV3a19Dyr9dx1MqodChsrXp4x0KA1UQoAhllwT0IKF7fkG6UaUpS u0uKhIEelLdNtoJUO/mCmS3nrurTFsjlQneTNRg7O0jVxFJ2dFXE0HgSD0f0r4EvwioG OkfgCWg/YVGwM1q5e8ev66MMYuUHAHyv8eM6Kol87oDxxgVJ7QVoNEqncSsIxlUxph98 lQQH2waREDpGZaU8dcqGYW8M1eaHlO1/c4bTUKq9YAr/9c8lRUHvO9C6DNrooUCaEOLk d9o5nfW1pYDSf8HybNya+qEtGw8GOyq4GnEvpwL5WRSMH3GMGPHr/B6yE3YZUqCukzER 56zA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id k21si1590822wrd.1.2018.01.31.01.42.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jan 2018 01:42:02 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w0V9g25Y008820 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 31 Jan 2018 10:42:02 +0100 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w0V9g1aZ008484; Wed, 31 Jan 2018 10:42:02 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 5/9] Revert "wic: Introduce the `WicExecError` exception class" Date: Wed, 31 Jan 2018 10:41:56 +0100 Message-Id: <039065c15832f8bd1d837883aa8c3dc7c2cbefbd.1517390790.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: X-TUID: InZvb4AUEOBR This reverts commit 17f9196e0f2cb7e1952369fb79f156fc8a3c678d. --- 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.13.6