From patchwork Fri Apr 29 14:53:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1624389 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=K9HNRNEL; 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kqb920mnxz9sBF for ; Sat, 30 Apr 2022 00:53:58 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 156A583B19; Fri, 29 Apr 2022 16:53:54 +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="K9HNRNEL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C1BF783F11; Fri, 29 Apr 2022 16:53:52 +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 EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::61e]) (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 77D39801BF for ; Fri, 29 Apr 2022 16:53:49 +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=hwDvUJLlKRZAEbkzed0ivyLoZJUNbjqVXAAcqG3omFrSy9lvMijZUAtvvB3ZWAOq4s6wBX5YvWEUbH0O07khncrCB17dZWnA11cdu7JvGo4YByYCa720FMbnCjx9f23O9OlKAsI9NB6cpMJsDX3GcW0k9NOUKMrWT9vcmcbQuj9fA5GobTK9hmyR+XGAANWv04gbi5KG3DL9rHVRmG4oY85vdQ+zCJxOoS7dDZtW9vQADgZrrV/JNqgV5rWCge916UzS60He9zWrHajomrkaUAbbLMKjOIQkymy+Vnl3Zy3gtfSiOFnZZfudl6G1i4wIyGgofvFu9yYvBSohZiLalA== 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=cuJahBR4Hlp85hW9VZ1pNKnKTTQYNd70cq+6OckvYzo=; b=Q+5U0gLEbhs4UMjJVZB4NS62ai1drvUrU+nh6OWSJ9OeRRjD5cxJZv5l64Ev+8f0VGJ90bF7B2vFF9JgXQOSEaoepN1t9kKP94tjQqACgzBUUAxZV1XUlWsYfpKBD/gZjUIz25NwoOmm6Fn6MiPX8CBa3KGhjMwLygxQbJYk50kybtGHyFoKXKllE/mviMUVg1DQmnWGNxPCHSOwDWTCSy34ttG+974tzM/xy9bQ8G53h87F2fUfPR5YoCg1lItQVSgHMiCjsdQapea+AyjleRXN3XWLLIc48jFCB7NyMcUva6wAX3z7v0aoFIc1p1zTNxaDi6mOOgdEcida/OR07Q== 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=cuJahBR4Hlp85hW9VZ1pNKnKTTQYNd70cq+6OckvYzo=; b=K9HNRNELpgyLo66U/P/VaceAR3MU61HsL+xVa1PkXRm4hlWMWA+fQWQX3UGkFTHHoMiNaiM6umuGle4czwflfMPy1AFIB60tz4L51T68F5QYB0I9nL7Cq2gNimxiOOGei5Pi2o5R50m9TYYdIE22E2RzaZncUr2VZyxDfQKPB5123RsQxNXgW/AEDsv/JCs9f37asBpe+2+61ym2S6WNg8Q0KcYcDvHER47eegZPV1qPQBtm1I2M6Qic00ZAidEkvMMNazNhXzAdbPZP80EPB/ouYsQ2VsT8XS+L6Kr2IPHS8BbJq7YTuxw6i5OL2tBeXSbvNG09v2x4tvJzwHF5Mg== 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 AM0PR0302MB3265.eurprd03.prod.outlook.com (2603:10a6:208:6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Fri, 29 Apr 2022 14:53:48 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::a9d3:8abd:3f5e:a0c]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::a9d3:8abd:3f5e:a0c%5]) with mapi id 15.20.5206.013; Fri, 29 Apr 2022 14:53:47 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Simon Glass Cc: Alper Nebi Yasak , Sean Anderson Subject: [PATCH v2] patman: Fix defaults not propagating to subparsers Date: Fri, 29 Apr 2022 10:53:34 -0400 Message-Id: <20220429145334.2497202-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty X-ClientProxiedBy: MN2PR03CA0008.namprd03.prod.outlook.com (2603:10b6:208:23a::13) 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: 2730f55c-db2e-454a-ffd4-08da29f010d2 X-MS-TrafficTypeDiagnostic: AM0PR0302MB3265: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: u64Iu47OTT/kKpdW/6lcTvpDIWT5JkZ3cC9kphetjepp7jIl90mIiCZi+omJ17MUheeD6SkhH9q6TQrhnGyvOqoMjitHKYcoppJaSW2D192PuEXWiFydbq5kuvJN/ZxE5DBtgdS0o814D9oqd3yETVttDLshZUmSLDajUhICI7ctzYIIpxWAu//3gwJ0x3FRzNAf5E19dKK0a88IqtgK1XyZHXFa2CbflvjCcLfPkKnPtuGhoxD5jgtYMYPxv1x5NfzkS+gjlMHhIM1GkBh1AoQyFBOnjMEpiP6eAxKCgkpNFXkr+6mwuLrixV36WEq8ws0fsKKCUf0/Bl0ayQBB/3wAJXnvROsVaieS7jtm8HzHn/uHnMrYIUd+m+OyRDbyz7mgl+369g9VGnUdB9EY3tLc0TnNW35JJp2acLt9uYxLo960rdth5BThibOt9rAJeDjzTU8qCAu6YPx7+Vqn2Imij1UJZop2RWxt8FZBQb0HVejkDHcPPqiIU3aurKzR4z+dkD9CPAFaB97WTAoeN8l2KSKwZpCT0Nb6T+YOJKS46k6Bckl12DOK9wURdGnWudaTKWZHpHl8wj+tXUwty8Znl9g9ITN2ZFIPNRHq6J3fll+lsD4JQCMUf/LoMGBLkbq8MG1D1uqUDX9dvFJUzsptZ/9+E4kUqbSy4X2C1JOXINDYzzJXNMhC2rmTdgWMZgqE4UP0IIq8bn2+Sy79yxCk4bLIcDQO9REgXknOtPHZOyFpN3ZF6udXmCtFT0myOoc8PPEpSmin6yUOSLFZq8hp+ibRVn2Vhc7sb9YyaMw= 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)(316002)(38100700002)(6512007)(186003)(966005)(44832011)(1076003)(6666004)(107886003)(508600001)(86362001)(36756003)(8936002)(6486002)(54906003)(6916009)(52116002)(2616005)(83380400001)(66476007)(66556008)(38350700002)(5660300002)(6506007)(66946007)(2906002)(8676002)(4326008)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5XYG525cH87Q6o9X00Sp9Xv4W5eq4PwWINy3h1S/UaGyGwMrl+JMQEDz3+UWG3yKzskqaU7tiN6Ux5C1kzlx8SEKTUWmsDytPtfl4XV9RfrT3DsCAON4TYp/zkD8l9W7LKe/GpyVOIyCezIpMVFs3nSDlLOfCXHgwIeYOenNdW6TGOU5ENOl5dioXc6zIjj/rFjXnJVhuqb/JXCrBg6f6mlvhRO9ISZrvntoXEefbV4Z3k0bKcHBkzVyM0Z8ZHlqSTDQwCa29tKsttFqnfsXZMndv3lZ62ZLunUgyTyJjz33eaj/oktOhoCSoHKUqvMT57rdMrfS6GlGwXChvP+0V60JHCo0q3XY3pldUweVKGKQirGKE3auIrwi+tfvruKHj1aE7cKi/rW3kRn0Qazj1TVBA9K2mEolKaKKe4om+NcCMBqZKqQLbjiV8TI0tl4vJWSNdkn6wwd6ZFFN4MQX41pCx8udHPbzD3OBgt2nzgwz8y/NDtwlo+2kXxTm1f53WTpm+kxkYZaC1tAjmgSXfNhhkk58w3BSlcytFRMpe8dKBOE678V0VB88G+7NMkfwwy2fjRSukF5SaQwPWg30ZV9KNGxkqGZfbTT/szAqhAqmsuD3vlx6rp5KsnnHG/NNn+gzd7wMNhosjfNafFM99ClyRdHlqh+2OyIDf1J+n6AB70U2rJh2WSmyhsBpmN8IXGgiJNPxMUIq9eafcT7E93CMR5WyRSYa3Xfjd9RWFVuhTzPV1pJZen+m5N59RlJdQNq6XR1tGgUDdrSN270/i6Yoy1e4kgl8SUKws4bvHuJU12cidUKnBTe69LhqNuChl5dycM7LgAvn6la8ST40DvKeQuVSWjrTjuR6HWZBHwOuInuURuGU+wWJR/eZvyYdk83+Kui72CqO5hglHKQZRiJhJuE+N8TodsRdPy+MIWxkYBYoHxU1Zpb+zDSjsPk5lYvcPDGQC4yIi3uvtr/f0LfHKNctdkh0uDPadZZEzNqe+WR+1TVGM+4QyrcFF/+hxGMiP6sNuc2JvHKyMbVAUE0MM3Gp0Mmx3RCLEzgn1l1zzsm/NBQfX984L7TX7Vm4T5KS/Y71GKbXHOpEwfnIFahM6i4Btz2DjWOZr+P82695zRl4wjqBQMosYWUcWf3ElYXruCGLYWGBVB0w3Dc7wLRgmhmU+G4Ea/OphI061OpStSOJHHnibBawaoHo2jBP0haFNl8vuY2YgWKfo0UR8nrYadNq2aduBxoWRg3jMb3a0nJpkVovgvxr3c40aE7/nWhrF7v0iEClPB2IYCevj9JVSR67eR4ZJrnFO0X43ADK/ioOK0RnxZ5hY/MvR8sAvwlFMPieBj5dwK///uBaeuuODvykUzPmSkkRR3gdH95/uEhXlOHgjJGLCKdIs1ui3j+zHpB8b2X02QDM/vZUv0cjQl4sjXg5FwvhHET86OYaOs9JStqE8MKixa8nEL8gJh/idfUuwh3oFhdD8TICFDGLkWIYRwKtyotIxR90NhRFBhGhbjrsuqbT2VDBDqNIAEK+KEQo7cret95/eQQ0oPXF3BVB8naal314bZoA9XlcOiXonpkgeNHGLjOj1Q4ucQNHMPL/CHrgb9ZhStXORhIGEBzO5x7wOBT+0xwnjigBwz7f0X3tmt0wiGUGPINwgjcYaQUnRSl8oZNqRp/SCMOAn64wJA5gzB9XBL6ZTxrHcri30bbg34jc5JxTrk/6QciQdr8/HxOYiDYsMYhZl/frpduX9IcXMvuJuQl5fWI= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2730f55c-db2e-454a-ffd4-08da29f010d2 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 14:53:47.9218 (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: Eg7zLXTi54cL4ASuqZZBYMzS4qHEPLZMg6q3+PAv+6fYT2KeiW4XSoz0MhBOx4G66O/v1kc1EjmMOYIpz7w2ow== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0302MB3265 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 (and 3.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 Signed-off-by: Sean Anderson Reviewed-by: Alper Nebi Yasak Tested-by: Alper Nebi Yasak --- Changes in v2: - Fix spelling of "propagating" in commit message - Update comment to more clearly indicate intent tools/patman/settings.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 7c2b5c196c..4c847fe88f 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,11 @@ 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 and manually propagate them to 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.