From patchwork Fri Apr 22 16:50:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1620937 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=FhxinLt+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KlL511KPkz9sFq for ; Sat, 23 Apr 2022 02:50:43 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 18C2583C24; Fri, 22 Apr 2022 18:50:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com 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=seco.com header.i=@seco.com header.b="FhxinLt+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D6EA283D4B; Fri, 22 Apr 2022 18:50:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0608.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1f::608]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C0EAE83B9F for ; Fri, 22 Apr 2022 18:50:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UJv/Lm4OEugmY9QPNknyov3UTQHLqaGf869JlD+0X3f+K8dvyN0Cn2ok93WnB3ZkWY6ZKYoetOJL76f3EoBcNH8UW29mzJGHOfAvHGBOu+YTuvkcR4JgUS1YD+tPvhRc78nHc9FbTdUZqdLo1Eyz874+GeuGSQm9InwneWGxChf/m/PpjLHxouB1Tu8hZ5F4Yd8cMV4M3H7NRl37349d/oK5WGmhN4UI3fibLonlq/PORySpNfi2qFUDqxepcm8h0mHxeDUPdG0pyy7JLUrmip/eJo/wD6nbschA+HoCIyAUePIkEkHGri00XI7ifsGdlCnxz9Qk9AmqV4Vt9zFQYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Qsxn4poguHykSrhvuNvgT5o5LanP2jg6yUCIZm1UB1A=; b=TIRS9zbNTvXLMY+bUIZmBMoois70UlHb7nnlhBbQtXvszsvH0EU8Hebqij4zBKtlTHj0y3OMDNzeHmNv3wh7jXUnKyih0bHuGcV709gfDZJU2DdWAnFvjGiomt0iu2ufBLNNONZlP2cfHvjamvXzNjaXa42ZyuhXc7XG2xG6XPnjmBkLnP4cOxFVSGWRKs+3CnOEwwXF4E3S23ELaqxQLR+u3i/Vfb87uLBWlF4EfXxRYba8J1ZTuzhGCrtTJyPlOD1Lo+bqExSy3KGYWCx/1bTpY5jBLA+1riuQW2ZDZdYOXEr1B/I9sPRlUsSkjNvdiAYs7DxA3qDoWPjyvmHxdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Qsxn4poguHykSrhvuNvgT5o5LanP2jg6yUCIZm1UB1A=; b=FhxinLt+tIaRrC6fi9ihHbDI9LQMJWj+aq5MwLLD7PtDw3pwSTGIHKuSN5GSI7eENHcnlMrE5VxYEqmBcEOlKnQd4VjAt+ERVlVCMHGwt0VUHqiEQe9gVIWIzYB9OAXTxO8Z4zI7F3g4JyF2f7uxC/8OZLCFCnBVrKyH0iBmbNqU+PxYwnWmB0pzDgXadlimqCioTjmt2f6IVVoXvuR2PPuMSv44v6tko6TMTFHlZTjHj3uTlsjhnmWGLBteZ+7K2aI+AGzSFFB0i+kHaaAMcdR9zZKTlJHCh9u/hHcntCCoDlgMeuSGlGh0ghTOz8gSGryqshqGq5TmJ6w/roTnMQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by GVXPR03MB8330.eurprd03.prod.outlook.com (2603:10a6:150:6f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 22 Apr 2022 16:50:28 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::714d:2b6:a995:51bd]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::714d:2b6:a995:51bd%4]) with mapi id 15.20.5186.015; Fri, 22 Apr 2022 16:50:28 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Simon Glass Cc: Sean Anderson Subject: [PATCH] patman: Fix defaults not propegating to subparsers Date: Fri, 22 Apr 2022 12:50:17 -0400 Message-Id: <20220422165017.2255930-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty X-ClientProxiedBy: BLAPR03CA0001.namprd03.prod.outlook.com (2603:10b6:208:32b::6) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5933c785-554a-4e26-03f9-08da2480344d X-MS-TrafficTypeDiagnostic: GVXPR03MB8330:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ddaUik8O2tDGm1U1AIp3y8gHoxZd8DsxZ3HW2lpTeTZPYKth8bhrxg+nA9Zg7negp3jSIA4fXfALad4LK/E51LXFOWr3xM2A4VsveL9JKzkeD+iyi1GNeGwucpeZbf/IoGemihhSybJUNhb1vq0N065xxXJe0ZCw2GxH/0gT/bZF75hOC4aZpQ0VYKCAtRMKDJdqbhbh9EHef/K89GXiz3nkDHknCZVixYzWBwMIRioNejcqmnWZGTXu5gs9aDxK25UHIEboLLC3iTJ6Ga7CFRrAFmBqrPr2pnWqDwtDZMFjgCi+zPidDBqGyxpsW48xc91dZJ5K5mS4MhnN4z4rIJ5dnY4FiPv+0SeHOCr7tEts3g6IEqhQW4Ahb5H+7d3z62NuAWLDmIN5vNpcUF+124754YsP2t5dQXdvryhykkilTKjNwJ9k/JrFKWkxeG64X9q+y8PDVVeuoBuYD74qRaqfXZqymJKxRbPbgf7AauoweDRQvpySvAOUOyHyFADIb06uUZYGqKNVQvtessPZPl+Dw8sJYneGm4jipd0TavY8HHeraHMxj6/EGX7lWplhRydiFO57Yay97ZiygWkCsrVYVUO5LKmO9mFp6YwgDnJp8TDgwUdocJ5IYP+8URgf5ligjHzDqEYAPxg1iDtPLA3wj/UEpoDM4aNQ4v4b8G8eF3HMsODiC45cvMmiMwBGoVTV0+wKgDxMBgSH0cjuulyIlviiv3bH650CwL6yJuFrS2S1mVu4qFiZ0gYgEnQeVwCL6Z3jAFUJY7axn/IRl4PziT1nwuRd7MRe/IfEy0A= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(38350700002)(66556008)(6506007)(2906002)(107886003)(86362001)(8676002)(66946007)(4326008)(6486002)(966005)(66476007)(44832011)(6512007)(8936002)(186003)(5660300002)(36756003)(6666004)(6916009)(2616005)(1076003)(508600001)(38100700002)(26005)(83380400001)(316002)(52116002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IJl5GRzvkzZ+mUC5wnFlf9IoDdtb2pRuLPkj+4ttElOMi0mdw4Z4vhzlTsp5SOeKju0ygQb70XqaB+obb39ih0lQSgTydx8JUqidjSM66wbEFRQkIhtaLUixdUPiRjPWASBuNs2gk6yaBWWuDfPpVFHcCapWe85DTBjmM3cAH1P3ZsvckN8fDdV8JE1KBs3X4tchVaxtp2uK5JAdsjK0BvjCKlj5Xckj75yojsvzWzdfXZkx6BgDQl78ZNrmo3qGhFsUiznf1xldmrDrIJFM+LME6qXW5CyolQx3F6YQCQzb0NBJ+d3RzZBOoCnzT4PWN6y4/RpITn77W5qLqWX9UaWTSibvTVpE9DUTS+zpc6c0YsZVdBoC6lUqs+DrzSJEFO5FxwfZEALS7UhVpDE8XB/jGkXXrRT6KRuaXG2hsETHulJQpx/x+oecwhYpvpGeuKCzAMeBbEkKL0AJN2V6d73ujIcJIQKhg3cAZbqXFZPCQBbUgqkAZO3EZSvlwKni4IrUt9Or2QQk+AaAGwC//DiNLsJH+aq99FEyLn6hinFSDJC2bCHLWi3bq3q7tvR+MDyCOPneOSiKTJM3LPnkfDMHsPR3TvGO9XDbxz5SVVQZRqPgnUSmsHfEVqDxBBErNmDsC8jJIQU66k/+kInu72bke6/3/v3gXAJ+pTB0nfOM1CI6j+0VBJuLDl/PCKX9UeZM5UbGNsDUK9lWptRP6x77YEvatxjTT+Wn54ynCJ+ZwbbGyqPv1Jya2kaLAIw1qXEjdoV9YAONEABiY6RSegE5YV1Uwu6+dStwWnuoBgqdtLe30BZK6CgO5coF9PVTRc1qQ6F1Jcghji8Xqjd4xBsEhBoM5oUp8wtxqx8RTlHbTgGTx0bJmSJW2spsDYV7aQ9+lu7STtD7zL9cWbY6rzJOR3cbmbh9lboXwpg+NDnovnUKbNWkbgZtatrFCzR20nnzY5A4dvpr4B1daRmB6Sv4B3vmdyRbNr+0EfVAHFf3+x6uVKBBCZgVynSbbCCyxMa00vdOGC2mtbvADERaYfH3Rill/r5CzB0xWRKaSQV83oGDk6cJH+NnU+TicmLF0FopGGg4riBdeDaSwHEQeWATC8MkyZOM5K+Df21RFtbkM/kI023s1FIhxaY21rL5RQQ+4kJiJLhcsBJbpRCESdYET8RauAMvodvKLZUTmsegTlPW4+5ho+EqQkFCu+TOxqr3y7V3JMsTE/W8yCZVyxVrPbqs+nWcTXtYryLxqCAGr3Q/psKkYZqveWhMupMC8Aef9r7i5wm3omHvuJXkT812jfygP4b9R4j3trbC8ADzutOqpYprY9HfXrh4VxdAf+DZeDR0/cVU+VO/7+bsUEh4yM+WwSXlkOdFVqqa3qqA9DTyZV3/K80CctjbbJEOO6AZ8Pv2FvfbSpCIAYWkfJUfW1YZPSbG9srYCArqTav8/05OFMtNJNjik0wl0EhZ2Xx1SyaF5njzBxLH46ZW7zKCj0nsCjm3E0hfK7gS6Zu2Z6+NmtU76BO0pACYf2zdknTddV9q9ybospXN+/sTwViGO6ujJB4kyQIhb2szGT7IXN+4LZL4e6wfjwtOzPaFhzIr9YAo+cBoECr8PINJ5Ug8MqWNwpsc2RzPnXmqrGPxXomHMxrLIhYDW2iTjlIGf3z9JLwYmmw0AIW19hcq6zA9kddEusElmgHuibMxlYJ4gb6dIU1r0g2eLaiiWGhP50wqwsgXeRFM9KAiURiWPw+zv+1SYYa60FLAo13ipKg= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5933c785-554a-4e26-03f9-08da2480344d X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 16:50:28.0097 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: So7Caq1qK1f/H+ibETysz6O5vGOA2W9Ilauzvw3W8RTMt17rsf6UjvbhJHfMj8jwFXvGeNYDIpO1AOVnRAGEaA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR03MB8330 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 On python 3.8.10, subparsers are not updated with defaults. I suspect this is related to [1]. Fix this by explicitly updating subparsers with settings. [1] https://github.com/python/cpython/issues/89398 Fixes: 3145b63513 ("patman: Update defaults in subparsers") Signed-off-by: Sean Anderson Reviewed-by: Alper Nebi Yasak Tested-by: Alper Nebi Yasak --- tools/patman/settings.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 7c2b5c196c..658fe12be5 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -246,8 +246,10 @@ def _UpdateDefaults(main_parser, config): # Collect the defaults from each parser defaults = {} + parser_defaults = [] for parser in parsers: pdefs = parser.parse_known_args()[0] + parser_defaults.append(pdefs) defaults.update(vars(pdefs)) # Go through the settings and collect defaults @@ -264,8 +266,10 @@ def _UpdateDefaults(main_parser, config): else: print("WARNING: Unknown setting %s" % name) - # Set all the defaults (this propagates through all subparsers) + # Set all the defaults (this does NOT propagate through all subparsers) main_parser.set_defaults(**defaults) + for parser, pdefs in zip(parsers, parser_defaults): + parser.set_defaults(**{ k: v for k, v in defaults.items() if k in pdefs}) def _ReadAliasFile(fname): """Read in the U-Boot git alias file if it exists.