Changeset 81284

Timestamp:

07/28/11 16:14:06 (4 years ago)

Author:

wsiegrist@…

Message:

Remove the portlist during the same step that we create it in so failing to reach the cleanup step does not leave behind a stale list.

File:

• contrib/buildbot/master.cfg (modified) (2 diffs)

contrib/buildbot/master.cfg

@@ -175 +175 @@
                            'SRC_PREFIX': WithProperties(src_prefix),
                            'BASE_UPDATE': 'selfupdate'}))
-ports_factory.addStep(ShellCommandWithPortList(command=WithProperties('for portname in %(portlist)s; do for subport in `./subports.tcl $portname`; do echo $subport >> portlist; done; done')))
+ports_factory.addStep(ShellCommandWithPortList(command=WithProperties('rm -f portlist; for portname in %(portlist)s; do for subport in `./subports.tcl $portname`; do echo $subport >> portlist; done; done')))
 # run MPAB on the port list
 ports_factory.addStep(Compile(command=["./mpab", "buildports", "portlist"],
@@ -209 +209 @@
                         logfiles={"portstatus": "portstatus.log"}))
 # TODO: do we want to upload the individual logs so maintainers can review them?
-ports_factory.addStep(ShellCommand(command="rm -rf ./logs-* portlist ./"+ulpath,
+ports_factory.addStep(ShellCommand(command="rm -rf ./logs-* ./"+ulpath,
                                    name="cleanup",
                                    description="cleanup"))