diff options
Diffstat (limited to 'meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch')
| -rw-r--r-- | meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch | 19 |
1 files changed, 8 insertions, 11 deletions
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 6ed15ab09c..bf5a197230 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 @@ -1,7 +1,7 @@ -From ffe06c6dd812b604d6482e4353d5564fad78bc90 Mon Sep 17 00:00:00 2001 +From 737e9a7c11233183f48ce6c83d38b504c8ffed12 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 30 Jul 2018 15:52:21 +0800 -Subject: [PATCH 4/4] load.py: retry to invoke request with timeout +Subject: [PATCH] load.py: retry to invoke request with timeout While networkless, use request to fetch kickstart file from network, it failed and wait 300s to break, we should retry @@ -11,23 +11,23 @@ network is up, the fetch works. Upstream-Status: inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- pykickstart/load.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pykickstart/load.py b/pykickstart/load.py -index ad3bad1..a5cbbc5 100644 +index f75fe5d3..a8f3ed1d 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py -@@ -21,6 +21,7 @@ import requests +@@ -21,12 +21,16 @@ import requests from requests.auth import HTTPDigestAuth from requests.auth import HTTPBasicAuth +import time import shutil - import six -@@ -28,6 +29,9 @@ from pykickstart.errors import KickstartError, KickstartAuthError + from pykickstart.errors import KickstartError, KickstartAuthError from pykickstart.i18n import _ from requests.exceptions import SSLError, RequestException @@ -37,7 +37,7 @@ index ad3bad1..a5cbbc5 100644 _is_url = lambda location: '://' in location # RFC 3986 SSL_VERIFY = False -@@ -73,6 +77,29 @@ def load_to_file(location, destination): +@@ -72,6 +76,29 @@ def load_to_file(location, destination): _copy_file(location, destination) return destination @@ -67,7 +67,7 @@ index ad3bad1..a5cbbc5 100644 def _get_auth(location, user=None, passwd=None): auth = None -@@ -94,6 +121,10 @@ def _get_auth(location, user=None, passwd=None): +@@ -93,6 +120,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''' @@ -78,6 +78,3 @@ index ad3bad1..a5cbbc5 100644 auth = _get_auth(location, user=user, passwd=passwd) try: request = requests.get(location, verify=SSL_VERIFY, auth=auth) --- -2.7.4 - |