From patchwork Fri Jun 28 14:08:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1124286 X-Patchwork-Delegate: sjg@chromium.org Return-Path: 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=) 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="T2PipPaS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45ZzXP0Bj3z9s3Z for ; Sat, 29 Jun 2019 00:23:48 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8E922C21E07; Fri, 28 Jun 2019 14:14:58 +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 EEF82C21C93; Fri, 28 Jun 2019 14:10:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 26BD9C21DB5; Fri, 28 Jun 2019 14:09:52 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id A68DEC21DA2 for ; Fri, 28 Jun 2019 14:09:47 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id r185so12784146iod.6 for ; Fri, 28 Jun 2019 07:09:47 -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=Rhb8OvEWLeVZrzCXGClr81H2jBikfs9bcHP21UW2tjU=; b=T2PipPaSiCJpMLIebgk1kqQJs3DPSw9vjEC7NTCFTcppQSayOZreXHOtuj+Aiy3NNa 1HVWjVTvZTSc7EWN3qvi/a3jsU5M26oOmWaraqCZ58eGW5Uo5gXuAWzroglX+ln8LULt XsJzXqM37keFOOoGHu8ZL5JyIgW3U0AY58rbQ= 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=Rhb8OvEWLeVZrzCXGClr81H2jBikfs9bcHP21UW2tjU=; b=sW8SxUSG/6sQMDpSppprwc3NiAJRwag2aLomlz8lsOVuvxmvKYpti0CjNgFGtC+vP1 +b6aQ8LiYT0SOug8jt6MH23M5uRlb5MiPc8TWk1YsE4zWGqG2t25gguPsLaLyoNmSfqU aAQtRBnCTyywkwOmu12rbb/7QwUcjBUDeHclywiO4b1W9EdXE/Z0nswD9gjDORFoBPQ+ E0RJuOXarkFgOZJWCNSTbBGPq/dr6DXJTKOmF82n/ZIlWWgb4mWvOS4sJOt0tMq8lbDY NfNvkie1abIXBya/k+9vMjsmD+fiqt7ai5lmGGtUW3ome6HVzHwPO03ERQBnJmx9CJIH dDxg== X-Gm-Message-State: APjAAAWO3ZyQtHrLGsiFHfazT4tsxHk9SPGh3ipw2cJ5JlaT576RSeor HUe3Fc1bnrYXIlagln4fCorIBcwox8w= X-Google-Smtp-Source: APXvYqxjXZFGHFPQw4Osk4E9kyF/srNZjh00IZGubBc/g1n0kN09BUx11lI39xgMMJhJdhhiFpVGcA== X-Received: by 2002:a5d:8447:: with SMTP id w7mr11668480ior.197.1561730986474; Fri, 28 Jun 2019 07:09:46 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id e26sm2839157iod.10.2019.06.28.07.09.45 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 07:09:46 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Fri, 28 Jun 2019 08:08:46 -0600 Message-Id: <20190628140919.145948-5-sjg@chromium.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190628140919.145948-1-sjg@chromium.org> References: <20190628140919.145948-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" If kwargs contains raise_on_error then this function generates an error due to a duplicate argument. Fix this. Signed-off-by: Simon Glass --- tools/patman/command.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)