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

[Markus Mohrhard]

 bin/update/config.py                                       |    2 ++
 bin/update/create_partial_update.py                        |    2 +-
 officecfg/registry/schema/org/openoffice/Office/Update.xcs |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b4ef794ef54f2afa4c44ae3a20add843b15ad461
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri May 19 23:13:40 2017 +0200

    take the update server url from the config
    
    Change-Id: I9960cbc0b0c9037a1c9cf0ef7a9699bb09ad054e

diff --git a/bin/update/config.py b/bin/update/config.py
index 2af895bb2921..0279a172d258 100644
--- a/bin/update/config.py
+++ b/bin/update/config.py
@@ -9,6 +9,7 @@ class Config(object):
         self.channel = None
         self.base_url = None
         self.upload_url = None
+        self.server_url = None
 
 def parse_config(config_file):
     config = configparser.ConfigParser()
@@ -21,5 +22,6 @@ def parse_config(config_file):
     data.certificate_path = updater_data['certificate-path']
     data.channel = updater_data['channel']
     data.upload_url = updater_data['upload-url']
+    data.server_url = updater_data["ServerURL"]
 
     return data
diff --git a/bin/update/create_partial_update.py b/bin/update/create_partial_update.py
index 23d4f6fe6a90..232cc68bfe1a 100755
--- a/bin/update/create_partial_update.py
+++ b/bin/update/create_partial_update.py
@@ -55,7 +55,7 @@ def handle_language(lang_entries, filedir):
 
 def download_mar_for_update_channel_and_platform(config, platform, temp_dir):
     mar = os.environ.get('MAR', 'mar')
-    base_url = "http://updater.libreofficecrash.org/update/partial-targets/1/"
+    base_url = config.server_url + "update/partial-targets/1/"
     url = base_url + platform + "/" + config.channel
     r = requests.get(url)
     if r.status_code is not 200:
commit 95602b8b12f652822b1c7b0f65d183128d51f76c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri May 19 23:08:22 2017 +0200

    prepare everything for automatic update builds
    
    We now have a TDF server that we can use for the update checks.
    
    Change-Id: I081b6f2f65d0abf6cc9d4a1ce11a68ba1cd076c7

diff --git a/officecfg/registry/schema/org/openoffice/Office/Update.xcs b/officecfg/registry/schema/org/openoffice/Office/Update.xcs
index 49021c3f7bfa..5ad40022e3e5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Update.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Update.xcs
@@ -39,13 +39,13 @@
             <info>
                 <desc>The URL that is used for the update check</desc>
             </info>
-            <value>http://updater.libreofficecrash.org/</value>
+            <value>http://vm195.documentfoundation.org/</value>
         </prop>
         <prop oor:name="UpdateChannel" oor:type="xs:string" oor:nillable="false">
             <info>
                 <desc>The update channel that is currently in use</desc>
             </info>
-            <value>Release</value>
+            <value>daily-master-gandalf</value>
         </prop>
     </group>
   </component>