phase1: s/SetProperty/SetPropertyFromCommand/

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 <hacks@slashdirt.org>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 15a1be88e77458abf9de2f0f222b52f0bed5541d..38d59e38537e5723bc1cab3fae65a6cebff1884f 100644 (file)
--- 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",