Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-07-24 00:28:02 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-07-24 00:28:02 +0400
commitb2170b91942f22b5fd554ba3e96b00469b662e47 (patch)
tree29e4a2188025baff312d7ecfaef1616b509caef1 /build_files/buildbot/slave_rsync.py
parentb1e1646d945d8f7e15c7828a9a5fb0fc4f516f51 (diff)
Revert "Buildbot: more fixes, this time to upload logic."
This reverts commit b1e1646d945d8f7e15c7828a9a5fb0fc4f516f51. Sorry, was a bit too quick on this one... :/
Diffstat (limited to 'build_files/buildbot/slave_rsync.py')
-rw-r--r--build_files/buildbot/slave_rsync.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/build_files/buildbot/slave_rsync.py b/build_files/buildbot/slave_rsync.py
index 5d25ca7e6fe..6936232a495 100644
--- a/build_files/buildbot/slave_rsync.py
+++ b/build_files/buildbot/slave_rsync.py
@@ -25,17 +25,16 @@ import os
import sys
# get builder name
-if len(sys.argv) < 3:
- sys.stderr.write("Not enough arguments, expecting builder and branch names\n")
+if len(sys.argv) < 2:
+ sys.stderr.write("Not enough arguments, expecting builder name\n")
sys.exit(1)
builder = sys.argv[1]
-branch = sys.argv[2]
# rsync, this assumes ssh keys are setup so no password is needed
local_zip = "buildbot_upload.zip"
remote_folder = "builder.blender.org:/data/buildbot-master/uploaded/"
-remote_zip = remote_folder + "buildbot_upload_" + builder + "_" + branch + ".zip"
+remote_zip = remote_folder + "buildbot_upload_" + builder + ".zip"
command = "rsync -avz %s %s" % (local_zip, remote_zip)
print(command)