[Libreoffice-commits] core.git: 2 commits - bin/update

[Markus Mohrhard]

 bin/update/create_build_config.py |    1 +
 bin/update/upload_builds.py       |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7d2fa41ca12a1724229ef8285af1895313e15c5f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 5 03:52:30 2017 +0200

    updater: abort if there are not enough command line parameters
    
    Change-Id: Ifb982aa4a0c496e1e21f762bd4e20241e41d4ea2
    Reviewed-on: https://gerrit.libreoffice.org/40780
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/bin/update/create_build_config.py b/bin/update/create_build_config.py
index 8d6bf5206ce8..b21735af2c97 100755
--- a/bin/update/create_build_config.py
+++ b/bin/update/create_build_config.py
@@ -23,6 +23,7 @@ def update_all_url_entries(data, **kwargs):
 def main(argv):
     if len(argv) < 7:
         print("Usage: create_build_config.py $PRODUCTNAME $VERSION $BUILDID $PLATFORM $TARGETDIR $UPDATE_CONFIG")
+        sys.exit(1)
 
     config = parse_config(argv[6])
 
commit 0ae09b2678778ccbf74d33390fa9f572ddca888f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 5 03:51:28 2017 +0200

    updater: convert to unix path in another place
    
    Change-Id: I07ab2d69891975c93ab1824410eacc30eb98fcb5
    Reviewed-on: https://gerrit.libreoffice.org/40779
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/bin/update/upload_builds.py b/bin/update/upload_builds.py
index e80acb19585c..210668e0d07c 100755
--- a/bin/update/upload_builds.py
+++ b/bin/update/upload_builds.py
@@ -5,6 +5,7 @@ import os
 import subprocess
 
 from config import parse_config
+from path import convert_to_unix
 
 from tools import replace_variables_in_string
 
@@ -25,7 +26,7 @@ def main():
     subprocess.call(command, shell=True)
     for file in os.listdir(update_dir):
         if file.endswith('.mar'):
-            subprocess.call(['scp', os.path.join(update_dir, file), upload_url])
+            subprocess.call(['scp', convert_to_unix(os.path.join(update_dir, file)), upload_url])
 
 if __name__ == '__main__':
     main()