From: Thibaut VARÈNE <hacks@slashdirt.org>
Date: Tue, 25 Oct 2022 11:08:50 +0000 (+0200)
Subject: phase1: FlattenList doesn't work on renderables
X-Git-Tag: v2~28
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=07ffa51834d28a356da412d1cd2e40e56ccc1142;p=buildbot.git

phase1: FlattenList doesn't work on renderables

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
---

diff --git a/phase1/master.cfg b/phase1/master.cfg
index c19c6c8..52b2b8d 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -474,14 +474,16 @@ def MakeEnv(overrides=None, tryccache=False):
 	return env
 
 @properties.renderer
-def NetLockDl(props):
+def NetLockDl(props, extralock=None):
 	lock = None
+	locks = []
 	if props.hasProperty("dl_lock"):
 		lock = NetLocks[props["dl_lock"]]
 	if lock is not None:
-		return [lock.access('exclusive')]
-	else:
-		return []
+		locks.append(lock.access('exclusive'))
+	if extralock is not None:
+		locks.append(extralock)
+	return locks
 
 @properties.renderer
 def NetLockUl(props):
@@ -789,7 +791,7 @@ for target in targets:
 		command = ["make", Interpolate("-j%(prop:nproc:-1)s"), "download", "V=s"],
 		env = MakeEnv(),
 		logEnviron = False,
-		locks = properties.FlattenList(NetLockDl, [dlLock.access('exclusive')]),
+		locks = NetLockDl.withArgs(dlLock.access('exclusive')),
 	))
 
 	factory.addStep(ShellCommand(