From: Thibaut VARÈNE <hacks@slashdirt.org>
Date: Tue, 26 Jun 2018 14:29:48 +0000 (+0200)
Subject: phase1: remove renderable locks: not supported in 0.8.9
X-Git-Tag: v1~136
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1e1a326074018542c4a6f14ffe12984fa9c8a192;p=buildbot.git

phase1: remove renderable locks: not supported in 0.8.9

Support for renderable locks was only added in buildbot 0.9.0

0.8.9 fails with:

	  File "/usr/lib/python2.7/dist-packages/buildbot/process/buildstep.py", line 266, in startStep
	    for access in self.locks]
	exceptions.TypeError: '_Renderer' object is not iterable

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

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 697f6fb..ddb7968 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -535,7 +535,6 @@ for target in targets:
 		branch = repo_branch,
 		mode = 'full',
 		method = 'clean',
-		locks = NetLockDl,
 		haltOnFailure = True,
 		doStepIf = IsGitCleanRequested,
 	))
@@ -545,7 +544,6 @@ for target in targets:
 		branch = repo_branch,
 		mode = 'full',
 		method = 'fresh',
-		locks = NetLockDl,
 		haltOnFailure = True,
 		doStepIf = IsGitFreshRequested,
 	))
@@ -590,7 +588,6 @@ for target in targets:
 		description = "Updating feeds",
 		command=["./scripts/feeds", "update"],
 		env = MakeEnv(),
-		locks = NetLockDl,
 	))
 
 	# feed
@@ -688,7 +685,7 @@ for target in targets:
 		command = ["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "download", "V=s"],
 		env = MakeEnv(),
 		logEnviron = False,
-		locks = properties.FlattenList(NetLockDl, [dlLock.access('exclusive')]),
+		locks = [dlLock.access('exclusive')],
 	))
 
 	factory.addStep(ShellCommand(
@@ -913,7 +910,6 @@ for target in targets:
 		env={'RSYNC_PASSWORD': rsync_bin_key},
 		haltOnFailure = True,
 		logEnviron = False,
-		locks = NetLockUl,
 	))
 
 	factory.addStep(FileDownload(
@@ -930,7 +926,6 @@ for target in targets:
 		env={'RSYNC_PASSWORD': rsync_bin_key},
 		haltOnFailure = True,
 		logEnviron = False,
-		locks = NetLockUl,
 	))
 
 	if enable_kmod_archive:
@@ -943,7 +938,6 @@ for target in targets:
 			env={'RSYNC_PASSWORD': rsync_bin_key},
 			haltOnFailure = True,
 			logEnviron = False,
-			locks = NetLockUl,
 		))
 
 	if rsync_src_url is not None:
@@ -955,7 +949,6 @@ for target in targets:
 			env={'RSYNC_PASSWORD': rsync_src_key},
 			haltOnFailure = True,
 			logEnviron = False,
-			locks = NetLockUl,
 		))
 
 	if False:
@@ -966,7 +959,6 @@ for target in targets:
 			env={'RSYNC_PASSWORD': rsync_bin_key},
 			haltOnFailure = False,
 			logEnviron = False,
-			locks = NetLockUl,
 		))
 
 	# logs
@@ -979,7 +971,6 @@ for target in targets:
 			haltOnFailure = False,
 			alwaysRun = True,
 			logEnviron = False,
-			locks = NetLockUl,
 		))
 
 	factory.addStep(ShellCommand(