From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from csb.redhat.com (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 07CF43858D32 for ; Sun, 15 Jan 2023 22:14:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 07CF43858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: by csb.redhat.com (Postfix, from userid 10916) id 410B8CB9DF; Sun, 15 Jan 2023 23:14:31 +0100 (CET) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] Add defaultWhenFalse=False to make_output_sync util.Property Date: Sun, 15 Jan 2023 23:14:29 +0100 Message-Id: <20230115221429.154033-1-mark@klomp.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3038.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The default value is used when the property doesn’t exist, or when the value is something Python regards as False. And Python regards the empty string as False. So add defaultWhenFalse=False to force Buildbot to use the default argument only if the parameter is not set. --- builder/master.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/master.cfg b/builder/master.cfg index a887e88..d623924 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -968,7 +968,8 @@ getversion_step = steps.SetPropertyFromCommand( # Allows a worker to override argument (with the empty string) # if make doesn't support --output-sync=line make_output_sync = util.Property('make_output_sync_arg', - default='--output-sync=line') + default='--output-sync=line', + defaultWhenFalse=False) make_step = steps.Compile( command=["make", make_output_sync, util.Interpolate('-j%(prop:ncpus)s')], name="make", -- 2.31.1