[81284] contrib/buildbot/master.cfg

[wsiegrist at apple.com]

Revision: 81284
          http://trac.macports.org/changeset/81284
Author:   wsiegrist at apple.com
Date:     2011-07-28 16:14:06 -0700 (Thu, 28 Jul 2011)
Log 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.

Modified Paths:
--------------
    contrib/buildbot/master.cfg

Modified: contrib/buildbot/master.cfg
===================================================================
--- contrib/buildbot/master.cfg	2011-07-28 22:20:55 UTC (rev 81283)
+++ contrib/buildbot/master.cfg	2011-07-28 23:14:06 UTC (rev 81284)
@@ -174,7 +174,7 @@
                       env={'PREFIX': WithProperties(prefix),
                            '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"],
                       env={'PREFIX': WithProperties(prefix),
@@ -208,7 +208,7 @@
                              },
                         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"))
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110728/bfe6e3af/attachment.html>