Modified: contrib/buildbot/master.cfg (95986 => 95987)

--- contrib/buildbot/master.cfg	2012-07-27 15:30:53 UTC (rev 95986)
+++ contrib/buildbot/master.cfg	2012-07-27 15:51:09 UTC (rev 95987)
@@ -196,15 +196,14 @@
 if production:
     prefix='/opt/local'
     src_prefix='/opt/mports'
-    dlhost=''
     dlpath='/www/hosts/packages.macports.org'
-    ulpath='archive_staging'
 else:
     prefix='%(workdir)s/opt/local'
     src_prefix='%(workdir)s/opt/mports'
-    dlhost=''
     dlpath='./deployed_archives'
-    ulpath='archive_staging'
+dlhost=''
+ulpath='archive_staging'
+ulpath_unique=ulpath+'-%(buildername)s'
 
 
 ports_factory = BuildFactory()
@@ -232,14 +231,14 @@
                            'ULPATH': ulpath}))
 # upload archives from build slave to master
 from buildbot.steps.transfer import DirectoryUpload
-ports_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=ulpath))
+ports_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=WithProperties(ulpath_unique)))
 # 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': ulpath,
+                           'ULPATH': WithProperties(ulpath_unique),
                            'DLHOST': dlhost,
                            'DLPATH': dlpath}))
 
@@ -247,7 +246,7 @@
 ports_factory.addStep(ShellCommand(command=["./do_status.sh"],
                                    name="status",
                                    description="status",
-                        env={'PREFIX': WithProperties(prefix),
+                        env={'PREFIX': WithProperties(prefix)
                              },
                         logfiles={"portstatus": "portstatus.log"}))
 # TODO: do we want to upload the individual logs so maintainers can review them?