X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/2cc269f5fc393b4dc8049bb72b0c939a5a12190c..435b98bcc7eb68c3a73d86504989cb441783a356:/tools/actions/initializer.py diff --git a/tools/actions/initializer.py b/tools/actions/initializer.py index 2173b45..6287810 100644 --- a/tools/actions/initializer.py +++ b/tools/actions/initializer.py @@ -2,7 +2,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later import logging import os -import requests from tools import helpers import tools.config @@ -45,11 +44,11 @@ def setup_config(args): args.system_ota = args.system_channel + "/" + args.rom_type + \ "/waydroid_" + args.arch + "/" + args.system_type + ".json" - system_request = requests.get(args.system_ota) - if system_request.status_code != 200: + system_request = helpers.http.retrieve(args.system_ota) + if system_request[0] != 200: if args.images_path != preinstalled_images: raise ValueError( - "Failed to get system OTA channel: {}".format(args.system_ota)) + "Failed to get system OTA channel: {}, error: {}".format(args.system_ota, system_request[0])) else: args.system_ota = "None" @@ -58,8 +57,8 @@ def setup_config(args): for vendor in [device_codename, get_vendor_type(args)]: vendor_ota = args.vendor_channel + "/waydroid_" + \ args.arch + "/" + vendor + ".json" - vendor_request = requests.get(vendor_ota) - if vendor_request.status_code == 200: + vendor_request = helpers.http.retrieve(vendor_ota) + if vendor_request[0] == 200: args.vendor_type = vendor args.vendor_ota = vendor_ota break