diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 23:13:40 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 23:14:30 +0200 |
| commit | b4ef794ef54f2afa4c44ae3a20add843b15ad461 (patch) | |
| tree | 0749851f5c02e21a2db487df08b8262b067403c6 /bin | |
| parent | 95602b8b12f652822b1c7b0f65d183128d51f76c (diff) | |
take the update server url from the config
Change-Id: I9960cbc0b0c9037a1c9cf0ef7a9699bb09ad054e
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/update/config.py | 2 | ||||
| -rwxr-xr-x | bin/update/create_partial_update.py | 2 |
2 files changed, 3 insertions, 1 deletions
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: |