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 42BB7C636CC for ; Sun, 19 Feb 2023 22:03:18 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 072FF85843; Sun, 19 Feb 2023 23:02:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="VkhcnFC8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9E0E585778; Sun, 19 Feb 2023 23:02:18 +0100 (CET) Received: from xtrwhxbr.outbound-mail.sendgrid.net (xtrwhxbr.outbound-mail.sendgrid.net [167.89.10.181]) (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 C1CEE85867 for ; Sun, 19 Feb 2023 23:02:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=Elc0lsO1e2h/Porm6o7cZPM9V/GsnyK7pdFiz8v0yKg=; b=VkhcnFC8VUgUclrG6QedHkJ9FzKr3JRsFvIN2TUVN0KTlR6MMVk1m2vwPxcZtWahM8zU MfHlXzO/u9AuuNKcSkTGAR+3kqzMVg2hiavELEHis184HzSZA8Q96lhrPqClqn4suuOwz5 lMMnsVJE+UUe/e4JMkY0p8uOTLOFB9zYqiA+i/kerTJI5xznoghquuH5FvwrXX7gZ1Yein oj/bCk/kSZpI5W3d6S+gz0FfrCG9y2Pf/WEjqDf2jYkWYN4VPWzcuhUV8iLnSMHnEyIRMZ LNCax2GQ/DyXZUwnq8UnbuNlY6CwyV1LAnmYaakHBVuJQUgvibST9bDwFUfJ03Yg== Received: by filterdrecv-8dd65bbd4-9vgxf with SMTP id filterdrecv-8dd65bbd4-9vgxf-1-63F29C5E-4C 2023-02-19 22:02:06.503658592 +0000 UTC m=+788704.717523344 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id eRsjQj9OQYS5AGTIsnN2Aw Sun, 19 Feb 2023 22:02:06.298 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 8/9] binman: Show filename in missing blob help message Date: Sun, 19 Feb 2023 22:02:06 +0000 (UTC) Message-Id: <20230219220158.4160763-9-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: =?us-ascii?Q?TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxA?= =?us-ascii?Q?fZekEeQsTe+RrMu3cja6a0h4cPkSfys0bSYtpqA?= =?us-ascii?Q?WRaQ01JnImM+APt4y2M8Hs=2F2GjNE9NUgucallXR?= =?us-ascii?Q?lHqLv5H8O1tYla8XlqEuf0btarrTtVHcfKCo8zk?= =?us-ascii?Q?XZep7EEasJtqgJHgxr6L+zAdjs6TZBtLoyiFy+g?= =?us-ascii?Q?ZrnGqIqIWyrqpDFlMJJxpK4wjjaEhqMrxchq2L?= To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?b?Um9o4XI=?= , Heinrich Schuchardt , Marek =?iso-8859-1?b?QmVo+m4=?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii 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.6 at phobos.denx.de X-Virus-Status: Clean Show the filename next to the node path in missing blob help messages, also show a generic missing blob message when there was no help message for the help tag. Signed-off-by: Jonas Karlman --- tools/binman/control.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/binman/control.py b/tools/binman/control.py index b5ede60c1cde..a5ff1cb56245 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -105,8 +105,8 @@ def _ReadMissingBlobHelp(): _FinishTag(tag, msg, result) return result -def _ShowBlobHelp(path, text): - tout.warning('%s:' % path) +def _ShowBlobHelp(path, text, fname): + tout.warning('%s (%s):' % (path, fname)) for line in text.splitlines(): tout.warning(' %s' % line) tout.warning('') @@ -126,10 +126,17 @@ def _ShowHelpForMissingBlobs(missing_list): tags = entry.GetHelpTags() # Show the first match help message + shown_help = False for tag in tags: if tag in missing_blob_help: - _ShowBlobHelp(entry._node.path, missing_blob_help[tag]) + _ShowBlobHelp(entry._node.path, missing_blob_help[tag], + entry.GetDefaultFilename()) + shown_help = True break + # Or a generic help message + if not shown_help: + _ShowBlobHelp(entry._node.path, "Missing blob", + entry.GetDefaultFilename()) def GetEntryModules(include_testing=True): """Get a set of entry class implementations -- 2.39.2