Worker lock on dl/ is now unnecessary
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
@properties.renderer
def NetLockDl(props, extralock=None):
lock = None
@properties.renderer
def NetLockDl(props, extralock=None):
lock = 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:
- locks.append(lock.access('exclusive'))
- if extralock is not None:
- locks.append(extralock)
- return locks
+ return [lock.access('exclusive')]
+ else:
+ return []
@properties.renderer
def NetLockUl(props):
@properties.renderer
def NetLockUl(props):
-dlLock = locks.WorkerLock("worker_dl")
-
workerNames = [ ]
for worker in c['workers']:
workerNames = [ ]
for worker in c['workers']:
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 = NetLockDl.withArgs(dlLock.access('exclusive')),
))
factory.addStep(ShellCommand(
))
factory.addStep(ShellCommand(