From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 14 Jun 2016 13:22:48 +0000 (+0200)
Subject: phase1: use target~subtarget as unique partial directory name
X-Git-Tag: v1~260
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e9ab061a5f0643d3d0a45e30c801587d3e159788;p=buildbot.git

phase1: use target~subtarget as unique partial directory name

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/phase1/master.cfg b/phase1/master.cfg
index e7d3485..744ae55 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -438,7 +438,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 	factory.addStep(ShellCommand(
 		name = "targetupload",
 		description = "Uploading target files",
-		command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-avz", "bin/targets/%s/%s/" %(ts[0], ts[1]), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+		command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "bin/targets/%s/%s/" %(ts[0], ts[1]), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
 		env={'RSYNC_PASSWORD': rsync_bin_key},
 		haltOnFailure = True,
 		logEnviron = False
@@ -448,7 +448,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 		factory.addStep(ShellCommand(
 			name = "sourceupload",
 			description = "Uploading source archives",
-			command=["rsync", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-avz", "dl/", "%s/" %(rsync_src_url)],
+			command=["rsync", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "dl/", "%s/" %(rsync_src_url)],
 			env={'RSYNC_PASSWORD': rsync_src_key},
 			haltOnFailure = True,
 			logEnviron = False
@@ -458,7 +458,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 		factory.addStep(ShellCommand(
 			name = "packageupload",
 			description = "Uploading package files",
-			command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-avz", "bin/packages/", "%s/packages/" %(rsync_bin_url)],
+			command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "bin/packages/", "%s/packages/" %(rsync_bin_url)],
 			env={'RSYNC_PASSWORD': rsync_bin_key},
 			haltOnFailure = False,
 			logEnviron = False
@@ -469,7 +469,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 		factory.addStep(ShellCommand(
 			name = "upload",
 			description = "Uploading logs",
-			command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+			command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
 			env={'RSYNC_PASSWORD': rsync_bin_key},
 			haltOnFailure = False,
 			alwaysRun = True,