Message ID | 20190708191856.138863-5-sjg@chromium.org |
---|---|
State | Accepted |
Commit | 512f4550d29547819ef41c7aa39689dafde5afef |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="TTqHHoiq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45jFjH0Z9Pz9sDB for <incoming@patchwork.ozlabs.org>; Tue, 9 Jul 2019 05:23:15 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A91B0C21CB1; Mon, 8 Jul 2019 19:23:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B71F9C21CB1; Mon, 8 Jul 2019 19:21:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2C585C21C4A; Mon, 8 Jul 2019 19:21:04 +0000 (UTC) Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) by lists.denx.de (Postfix) with ESMTPS id 9A4CAC21BE5 for <u-boot@lists.denx.de>; Mon, 8 Jul 2019 19:21:03 +0000 (UTC) Received: by mail-io1-f54.google.com with SMTP id k20so37784119ios.10 for <u-boot@lists.denx.de>; Mon, 08 Jul 2019 12:21:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CSwsbEgMEl5r5ivNLDazPY+NU57ZKLUMxMVM/bkfwUo=; b=TTqHHoiq01vYZwjZN8PVzNV6PX6k0CT8ETX6tLcbf7WB8bU2tVavtzhgN4vf5ciFwd CZwWsM3VLll4onKDBjFJqMRxZYP6fkWfz2cl7no16PvdGqyyEbMWuCWFywl3B5Hr4h1z XBB9q4mphM7GZ0Ly6f3UY5maSX1hELZPrO+PQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CSwsbEgMEl5r5ivNLDazPY+NU57ZKLUMxMVM/bkfwUo=; b=QvAtyq5nKqLif9Cwu8ItvtJhfq27PnGP97/07ISEw4pLGn2SKpDBOcL/06JDtAm/vn DNTKJlamoOVOze/osFRqmEzOJI8VMBFWuIndX8J3IBqrqJ95xIckW3fXOrK2EMC753+8 mYMTFE00sdZ5GnuwHQX1Pde0vA+Zsd291oNeHsktgMCyT9eFJS801JuzHICGFEoaFtky ppvVPTL9jLtUzGT5mq3Sv6+Lec+VZqFNVgFAkdppEMfRJU6YmiS1vie/QKdLUX7m1Ztx /revrdiO1FN8i6w4F8xNRTiQr8i6O4KTrZMjl4dKMvtdXh9SZP4ThMqkXWH6VLRExIoe jBow== X-Gm-Message-State: APjAAAVkOJjmrkEhcI4fZMag7iLvmKYRQ3/qb+fDuTSu/4MoJvegS/k9 XUW5FnJZ9DgSGy6k9n6V9J+NWrjdkSw= X-Google-Smtp-Source: APXvYqzs/cFWKRRi4rx0vh8XyvAvZ3ZVZqQW9CbPsZFiwVrZY5F4CcYCv6sNmxGP+nq2jkK0bouC+A== X-Received: by 2002:a02:5b05:: with SMTP id g5mr22380767jab.114.1562613662471; Mon, 08 Jul 2019 12:21:02 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id j1sm15545094iop.14.2019.07.08.12.21.01 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 12:21:01 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Mon, 8 Jul 2019 13:18:23 -0600 Message-Id: <20190708191856.138863-5-sjg@chromium.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190708191856.138863-1-sjg@chromium.org> References: <20190708191856.138863-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 04/37] tools: Drop duplicate raise_on_error argument X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
binman: Add CBFS support
|
expand
|
diff --git a/tools/patman/command.py b/tools/patman/command.py index 14edcdaffd2..16299f3f5be 100644 --- a/tools/patman/command.py +++ b/tools/patman/command.py @@ -108,8 +108,8 @@ def RunPipe(pipe_list, infile=None, outfile=None, return result def Output(*cmd, **kwargs): - raise_on_error = kwargs.get('raise_on_error', True) - return RunPipe([cmd], capture=True, raise_on_error=raise_on_error).stdout + kwargs['raise_on_error'] = kwargs.get('raise_on_error', True) + return RunPipe([cmd], capture=True, **kwargs).stdout def OutputOneLine(*cmd, **kwargs): raise_on_error = kwargs.pop('raise_on_error', True)
If kwargs contains raise_on_error then this function generates an error due to a duplicate argument. Fix this. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: None tools/patman/command.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)