From ac7121d1ea78b9fc5421d84f7639df79dba5e9a1 Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Sun, 24 Nov 2019 15:50:17 +0900 Subject: [PATCH] Use original site for update.xml Signed-off-by: Hiroshi Miura --- CHANGELOG.rst | 3 +-- aqt/archives.py | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c597635..877f020 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -15,16 +15,15 @@ Added ----- * Introduce helper module. - * Introduce 'settings.ini' file which has a configuration for aqt module. Changed ------- +* Use original site for downloading Update.xml * Select mirror site before accessing repository database. This will speed-up installation process. - * Now don't install extra modules when installing 'wasm_32' arch. You should explicitly specify it with '-m' option. diff --git a/aqt/archives.py b/aqt/archives.py index d38b1f9..bf76112 100644 --- a/aqt/archives.py +++ b/aqt/archives.py @@ -85,11 +85,12 @@ class QtArchives: qt_ver_num = self.version.replace(".", "") # Get packages index - archive_url = "{0}{1}{2}{3}/qt5_{4}{5}".format(self.base, self.os_name, + archive_path = "{0}{1}{2}/qt5_{3}{4}".format(self.os_name, '_x86/' if self.os_name == 'windows' else '_x64/', self.target, qt_ver_num, '_wasm/' if self.arch == 'wasm_32' else '/') - update_xml_url = "{0}Updates.xml".format(archive_url) + update_xml_url = "{0}{1}Updates.xml".format(self.BASE_URL, archive_path) + archive_url = "{0}{1}".format(self.base, archive_path) try: r = requests.get(update_xml_url) except requests.exceptions.ConnectionError as e: