From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91B96C433EF for ; Mon, 28 Feb 2022 19:09:37 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 25A9A820AC; Mon, 28 Feb 2022 20:09:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Rgex5oj9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2AE2283A7A; Mon, 28 Feb 2022 20:09:14 +0100 (CET) Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EF97D83BCF for ; Mon, 28 Feb 2022 20:09:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oi1-x22b.google.com with SMTP id k2so14142169oia.2 for ; Mon, 28 Feb 2022 11:09:04 -0800 (PST) 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=9I5nhr3Uf5h+jSVzPVhDUx5Wpdmn/dBH/9pz5Njnlhg=; b=Rgex5oj9cMLTAEzCB3Q+yCjNs2vTAcN+PBjpwE/T+KkJ3l/9TQdcncCP7XpGUogZ3v FqH25bh7htvrgG1fjQy44SFWb/FUs15523JT2BeneP7jn9gvL0MpR7Bn3dsoojR5HwEU vpATYnbi6IlS2FCYC52Uq8SQ+tUFpYFkuuNwA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9I5nhr3Uf5h+jSVzPVhDUx5Wpdmn/dBH/9pz5Njnlhg=; b=bpkJ0Txg9SkwrnTv9AnWj2/WJHnq5xzDg85xHg8/IZGHUM0bcxu/Iq5kNcCTyfYRWS YxnAJCYqLP9wK29CobRGabRbhX/RH4326YhNVydPcfkbShxAq2Atj+3IgYexyyleROR+ 36U28QBswNROUKTlB/CXozlaAxR57NLaZU1QTvoL8VNRmV95hgnSy5q65CZf7zRa9mIX 3mTI7j0uz87Ko5YU/xhVfrgMEyF4wEorycIMpcGSJR6dCegR0hl+06ezDjm2GmVO5QwT /HUZTSM+Sf0tyH1Ri/zBTud63CAsZNWBBsejPmux4Asdu8NTroI8qIbn7eCoOHhMYWHh FL5A== X-Gm-Message-State: AOAM530ZIo363EtlAIRyfh7qC48MPdbUY9uBbwSKxVG5FRqSMQQ2GaN9 SzzVH1DYa5bV5plYX0zqygAjBg11RR32TA== X-Google-Smtp-Source: ABdhPJwsZAn1dUPzjyRhbjOFv26afI/sBnLxS3lGMeDWxnG+pmWG4oturK3lzx0CiYIfO0ZQuv8miQ== X-Received: by 2002:a05:6808:1149:b0:2d5:f225:64c5 with SMTP id u9-20020a056808114900b002d5f22564c5mr10042373oiu.72.1646075343585; Mon, 28 Feb 2022 11:09:03 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id f188-20020a4a58c5000000b0031ccb8272f1sm5290577oob.33.2022.02.28.11.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 11:09:03 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 02/18] buildman: Fix up cfgutil Date: Mon, 28 Feb 2022 12:08:19 -0700 Message-Id: <20220228190835.1480772-3-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.574.g5d30c73bfb-goog In-Reply-To: <20220228190835.1480772-1-sjg@chromium.org> References: <20220228190835.1480772-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean The name of this function changed at the same time as this file was added. Fix the naming. Signed-off-by: Simon Glass --- tools/buildman/cfgutil.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/buildman/cfgutil.py b/tools/buildman/cfgutil.py index 4eba50868f..166b7b2419 100644 --- a/tools/buildman/cfgutil.py +++ b/tools/buildman/cfgutil.py @@ -123,7 +123,7 @@ def adjust_cfg_file(fname, adjust_cfg): C=val to set the value of C (val must have quotes if C is a string Kconfig) """ - lines = tools.ReadFile(fname, binary=False).splitlines() + lines = tools.read_file(fname, binary=False).splitlines() out_lines = adjust_cfg_lines(lines, adjust_cfg) out = '\n'.join(out_lines) + '\n' tools.WriteFile(fname, out, binary=False) @@ -219,7 +219,7 @@ def check_cfg_file(fname, adjust_cfg): Returns: str: None if OK, else an error string listing the problems """ - lines = tools.ReadFile(fname, binary=False).splitlines() + lines = tools.read_file(fname, binary=False).splitlines() bad_cfgs = check_cfg_lines(lines, adjust_cfg) if bad_cfgs: out = [f'{cfg:20} {line}' for cfg, line in bad_cfgs] -- 2.35.1.574.g5d30c73bfb-goog