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

Markus Mohrhard markus.mohrhard at googlemail.com
Sat Aug 5 03:33:08 UTC 2017


 bin/update/create_build_config.py |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit e371ec501db0c473bea7ef7325d9a9049f913b5e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 5 03:53:13 2017 +0200

    updater: disable lang pack handling for windows
    
    Change-Id: Ie3005a3fd4bc491cea0dd965931a7c0ac7ef813e
    Reviewed-on: https://gerrit.libreoffice.org/40781
    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 b21735af2c97..e2d197388793 100755
--- a/bin/update/create_build_config.py
+++ b/bin/update/create_build_config.py
@@ -10,13 +10,18 @@ from tools import replace_variables_in_string
 
 def update_all_url_entries(data, **kwargs):
     data['complete']['url'] = replace_variables_in_string(data['complete']['url'], **kwargs)
-    for language in data['languages']:
-        language['complete']['url'] = replace_variables_in_string(language['complete']['url'], **kwargs)
+
+    if sys.platform != "cygwin":
+        for language in data['languages']:
+            language['complete']['url'] = replace_variables_in_string(language['complete']['url'], **kwargs)
 
     if 'partials' in data:
         for partial in data['partials']:
             partial['file']['url'] = replace_variables_in_string(partial['file']['url'], **kwargs)
 
+            if sys.plaform == "cygwin":
+                continue
+
             for lang, lang_file in partial['languages'].items():
                 lang_file['url'] = replace_variables_in_string(lang_file['url'], **kwargs)
 
@@ -34,10 +39,14 @@ def main(argv):
             'platform' : argv[4]
             }
 
-    extra_data_files = ['complete_info.json', 'complete_lang_info.json', 'partial_update_info.json']
+    extra_data_files = ['complete_info.json', 'partial_update_info.json']
+    if sys.platform != "cygwin":
+        extra_data_files += 'complete_lang_info.json'
 
     for extra_file in extra_data_files:
         extra_file_path = os.path.join(argv[5], extra_file)
+        if not os.path.exists(extra_file_path):
+            continue
         with open(extra_file_path, "r") as f:
             extra_data = json.load(f)
             data.update(extra_data)


More information about the Libreoffice-commits mailing list