From 21a69c4c90303e334cf0679251c82c8035afb32d Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Sat, 11 Feb 2023 21:33:22 +0800 Subject: python3-pykickstart: upgrade 3.34 -> 3.43 0001-support-authentication-for-kickstart.patch 0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch 0004-load.py-retry-to-invoke-request-with-timeout.patch refreshed for new version. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...-load.py-retry-to-invoke-request-with-timeout.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch') diff --git a/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch b/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch index bf5a197230..b09bb74df8 100644 --- a/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch +++ b/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch @@ -11,19 +11,18 @@ network is up, the fetch works. Upstream-Status: inappropriate [oe specific] Signed-off-by: Hongxu Jia - --- pykickstart/load.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pykickstart/load.py b/pykickstart/load.py -index f75fe5d3..a8f3ed1d 100644 +index 58faba6..e856c8d 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py -@@ -21,12 +21,16 @@ import requests +@@ -20,12 +20,16 @@ + import requests from requests.auth import HTTPDigestAuth from requests.auth import HTTPBasicAuth - +import time import shutil @@ -34,10 +33,10 @@ index f75fe5d3..a8f3ed1d 100644 +import logging +log = logging.getLogger("anaconda.main") + - _is_url = lambda location: '://' in location # RFC 3986 + is_url = lambda location: '://' in location # RFC 3986 SSL_VERIFY = False -@@ -72,6 +76,29 @@ def load_to_file(location, destination): +@@ -71,6 +75,29 @@ def load_to_file(location, destination): _copy_file(location, destination) return destination @@ -67,7 +66,7 @@ index f75fe5d3..a8f3ed1d 100644 def _get_auth(location, user=None, passwd=None): auth = None -@@ -93,6 +120,10 @@ def _get_auth(location, user=None, passwd=None): +@@ -92,6 +119,10 @@ def _get_auth(location, user=None, passwd=None): def _load_url(location, user=None, passwd=None): '''Load a location (URL or filename) and return contents as string''' @@ -76,5 +75,8 @@ index f75fe5d3..a8f3ed1d 100644 + raise KickstartError(_("Connection %s failed" % location)) + auth = _get_auth(location, user=user, passwd=passwd) + try: - request = requests.get(location, verify=SSL_VERIFY, auth=auth) +-- +2.34.1 + -- cgit v1.2.3-54-g00ecf