From 421dd0486362e499644103b00446289598170478 Mon Sep 17 00:00:00 2001
From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Date: Fri, 22 Nov 2024 17:24:39 +0100
Subject: [PATCH] builders: Fix configuration for buildbot 4

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---
 builders.py             | 2 +-
 steps/writelayerinfo.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builders.py b/builders.py
index b4c08fa..3f6d70e 100644
--- a/builders.py
+++ b/builders.py
@@ -232,7 +232,7 @@ def prioritizeBuilders(master, builders):
                 time = time - builder_bonuses[bldr.name]
                 #log.msg("Adding %s so %s" % (str(builder_bonuses[bldr.name]), str(time)))
 
-        defer.returnValue((time, bldr))
+        return (time, bldr)
 
     transformed = yield defer.gatherResults(
         [transform(bldr) for bldr in builders])
diff --git a/steps/writelayerinfo.py b/steps/writelayerinfo.py
index d2c196f..a0669bd 100644
--- a/steps/writelayerinfo.py
+++ b/steps/writelayerinfo.py
@@ -41,7 +41,7 @@ class WriteLayerInfo(buildstep.ShellMixin, buildstep.BuildStep):
         cmd = yield self.makeRemoteShellCommand(
             command=writerepos)
         yield self.runCommand(cmd)
-        defer.returnValue(cmd.results())
+        return cmd.results()
 
 
 @defer.inlineCallbacks