Kaydet (Commit) b4ef794e authored tarafından Markus Mohrhard's avatar Markus Mohrhard

take the update server url from the config

Change-Id: I9960cbc0b0c9037a1c9cf0ef7a9699bb09ad054e
üst 95602b8b
...@@ -9,6 +9,7 @@ class Config(object): ...@@ -9,6 +9,7 @@ class Config(object):
self.channel = None self.channel = None
self.base_url = None self.base_url = None
self.upload_url = None self.upload_url = None
self.server_url = None
def parse_config(config_file): def parse_config(config_file):
config = configparser.ConfigParser() config = configparser.ConfigParser()
...@@ -21,5 +22,6 @@ def parse_config(config_file): ...@@ -21,5 +22,6 @@ def parse_config(config_file):
data.certificate_path = updater_data['certificate-path'] data.certificate_path = updater_data['certificate-path']
data.channel = updater_data['channel'] data.channel = updater_data['channel']
data.upload_url = updater_data['upload-url'] data.upload_url = updater_data['upload-url']
data.server_url = updater_data["ServerURL"]
return data return data
...@@ -55,7 +55,7 @@ def handle_language(lang_entries, filedir): ...@@ -55,7 +55,7 @@ def handle_language(lang_entries, filedir):
def download_mar_for_update_channel_and_platform(config, platform, temp_dir): def download_mar_for_update_channel_and_platform(config, platform, temp_dir):
mar = os.environ.get('MAR', 'mar') 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 url = base_url + platform + "/" + config.channel
r = requests.get(url) r = requests.get(url)
if r.status_code is not 200: if r.status_code is not 200:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment