Merge branch 'buildbot-0.9.X' into master.

2018-12-21 12:57:02 +01:00
parent e41a4477f2 d7ab6b77f1
commit dffb8c59a1
31 changed files with 238 additions and 3072 deletions
--- a/master_unpack.py
+++ b/master_unpack.py
@@ -119,12 +119,13 @@ if platform == '':
    sys.exit(1)

 # extract
+download_prefix = "/data/www/vhosts/builder.blender.org/webroot/download/"
 if not branch or branch == 'master':
-    directory = 'public_html/download'
+    directory = download_prefix
 elif branch == 'experimental-build':
-    directory = 'public_html/download/experimental'
+    directory = os.path.join(download_prefix, "experimental")
 else:
-    directory = 'public_html/download'
+    directory = download_prefix

 try:
    filename = os.path.join(directory, packagename)