From 91d8a9d0352cf8f2ca684df3db84caa1aad68dc6 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 3 Dec 2015 16:30:21 +0500 Subject: [PATCH] Buildbot: Make sure buildbot_upload.zip is created in the right place --- build_files/buildbot/slave_pack.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 55fc1399b32..30f02e2f57e 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -221,7 +221,7 @@ else: upload_filename = branch + "-" + upload_filename print("Creating .tar.bz2 archive") - os.system('tar -C../install -cjf %s.tar.bz2 %s' % (builder, builder)) + os.system('tar -C../install -cjf ../install/%s.tar.bz2 %s' % (builder, builder)) upload_filepath = install_dir + '.tar.bz2' @@ -265,7 +265,7 @@ if upload_filepath is None: # create zip file try: - upload_zip = "buildbot_upload.zip" + upload_zip = os.path.join(os.path.dirname(install_dir), "buildbot_upload.zip") if os.path.exists(upload_zip): os.remove(upload_zip) z = zipfile.ZipFile(upload_zip, "w", compression=zipfile.ZIP_STORED)