Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
return env
@properties.renderer
return env
@properties.renderer
+def NetLockDl(props, extralock=None):
if props.hasProperty("dl_lock"):
lock = NetLocks[props["dl_lock"]]
if lock is not None:
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):
@properties.renderer
def NetLockUl(props):
command = ["make", Interpolate("-j%(prop:nproc:-1)s"), "download", "V=s"],
env = MakeEnv(),
logEnviron = False,
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(
))
factory.addStep(ShellCommand(