From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6543937367387930624 X-Received: by 10.80.165.200 with SMTP id b8mr1030198edc.1.1523629149282; Fri, 13 Apr 2018 07:19:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.144.194 with SMTP id d2ls4419495eda.0.gmail; Fri, 13 Apr 2018 07:19:08 -0700 (PDT) X-Google-Smtp-Source: AIpwx48dZAMZjcIZM95QusLgzmtRkcxmYgGwKX7IRN6XrYt7xy8BMWMZECgVbJe+GnprPtBZSid5 X-Received: by 10.80.245.132 with SMTP id u4mr5200704edm.2.1523629148780; Fri, 13 Apr 2018 07:19:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523629148; cv=none; d=google.com; s=arc-20160816; b=y6AOT+t/wOsQGgvaw2lPGvI82SSKHUV3amkmJzLuW2Mm9CmwXNlaHPjiYUkCaW73jI iKpcGjcbOOroVD5Yw4N6NV0MQcTpQxXY6dKmbZJDNFvM+g93XO0f4UaERaifXKyEqc1V Ih+rlb2TeNbY8PEL5nJWUgGUwMazpiRXwXn8rQnsGnBBeez9ElnEET/dxowCnm92g6Ft BicYhhM+ac4HSQlcdw3FcLxMeCnbqVPqHAurvwBYyrTuVYk1lWsTipwM/Y8Mzg8iIUKc YHOgeiiiwViCBd2LgslPJLG8ZS5o50sIAEZOpB76E71d4M8Suz637Z0O3cDd3OT7ks5E 0/ew== 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=R1bZsAT+GODlEtZaB23oNIqTiPq7MKVhFb+8lCkLEmM=; b=0KMwlOvgbTklQV3ndxFoVsxtJlGpfshyf0R19tWmTHy+k9fK7sKxBCnwN2apyyIY11 1Scn3n355mwec1nZiwJ88AQe3YLO9+FjAnbsKywSVoVBdPCCc82ngS1NjGWlauDRcgm1 jttFrzCTC0lSQ9HdhSI69a61CjPV4OaQ4+2xtazwBxJ6VtRoOZDNm7lALnVb39M93CCH 1CkPaJ5V3TjpirEo/7Co0FS+p4PlwpT8hgguN3NJ3NLrDBJvuD4caR5ywHfrQ8j19fpz EymX2uKHarj+vwt5PVl8VF6RtpFIqPb4CM4kB3ZBZNQC4yuiYPwLnaZAzcacEKxKG5oC q5Ew== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id r15si299199edl.3.2018.04.13.07.19.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:19:08 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w3DEJ8Ex005505 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Apr 2018 16:19:08 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3DEJ8Vs011006; Fri, 13 Apr 2018 16:19:08 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Cedric Hombourger , Andreas Reichel , Henning Schild Subject: [PATCH v2 02/17] Revert "wic: Introduce the `WicExecError` exception class" Date: Fri, 13 Apr 2018 16:18:51 +0200 Message-Id: X-Mailer: git-send-email 2.16.1 In-Reply-To: References: In-Reply-To: References: X-TUID: D3YKojjNIqNJ 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 --- 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