Revision
96019
Author
wsiegrist@apple.com
Date
2012-07-28 18:42:18 -0700 (Sat, 28 Jul 2012)

Log Message

Remove use of WithProperties due to exceptions.

Modified Paths

Diff

Modified: contrib/buildbot/master.cfg (96018 => 96019)


--- contrib/buildbot/master.cfg	2012-07-28 20:20:18 UTC (rev 96018)
+++ contrib/buildbot/master.cfg	2012-07-29 01:42:18 UTC (rev 96019)
@@ -233,14 +233,14 @@
                            'ULPATH': ulpath}))
 # upload archives from build slave to master
 from buildbot.steps.transfer import DirectoryUpload
-ports_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=WithProperties(ulpath_unique)))
+ports_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=ulpath))
 # sign generated binaries and sync to download server (if distributable)
 from buildbot.steps.master import MasterShellCommand
 ports_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh"],
                                    name="deploy archives",
                                    description="deploy archives",
                       env={'PRIVKEY': privkey,
-                           'ULPATH': WithProperties(ulpath_unique),
+                           'ULPATH': ulpath, 
                            'DLHOST': dlhost,
                            'DLPATH': dlpath}))