From 3141c97843d9d6e84e39eac2f5769f82eb10214c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Fri, 22 Jun 2018 11:56:40 +0200 Subject: [PATCH] phase1: s/SetProperty/SetPropertyFromCommand/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit shell.SetProperty() is a deprecated name for SetPropertyFromCommand() SetProperty() in buildbot documentation refers to master.SetProperty which behaves in a completely different way Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 15a1be8..38d59e3 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -200,7 +200,6 @@ c['schedulers'].append(ForceScheduler( from buildbot.process.factory import BuildFactory from buildbot.steps.source.git import Git from buildbot.steps.shell import ShellCommand -from buildbot.steps.shell import SetProperty from buildbot.steps.shell import SetPropertyFromCommand from buildbot.steps.transfer import FileUpload from buildbot.steps.transfer import FileDownload @@ -424,7 +423,7 @@ for target in targets: factory = BuildFactory() # find number of cores - factory.addStep(SetProperty( + factory.addStep(SetPropertyFromCommand( name = "nproc", property = "nproc", description = "Finding number of CPUs", @@ -437,14 +436,14 @@ for target in targets: slavedest = "../findbin.pl", mode = 0755)) - factory.addStep(SetProperty( + factory.addStep(SetPropertyFromCommand( name = "gcc", property = "cc_command", description = "Finding gcc command", command = ["../findbin.pl", "gcc", cc_version[0], cc_version[1]], haltOnFailure = True)) - factory.addStep(SetProperty( + factory.addStep(SetPropertyFromCommand( name = "g++", property = "cxx_command", description = "Finding g++ command", @@ -629,7 +628,7 @@ for target in targets: )) # find libc suffix - factory.addStep(SetProperty( + factory.addStep(SetPropertyFromCommand( name = "libc", property = "libc", description = "Finding libc suffix", @@ -714,7 +713,7 @@ for target in targets: )) # find kernel version - factory.addStep(SetProperty( + factory.addStep(SetPropertyFromCommand( name = "kernelversion", property = "kernelversion", description = "Finding the effective Kernel version", @@ -781,7 +780,7 @@ for target in targets: )) # find rootfs staging directory - factory.addStep(SetProperty( + factory.addStep(SetPropertyFromCommand( name = "stageroot", property = "stageroot", description = "Finding the rootfs staging directory", -- 2.30.2