diff options
Diffstat (limited to 'meta-python/recipes-extended')
2 files changed, 8 insertions, 8 deletions
diff --git a/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch b/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch index 6af4bde08..e7533f476 100644 --- a/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch +++ b/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b7070a79432b790dffa82401364e4fd8d906eb2b Mon Sep 17 00:00:00 2001 | 1 | From f05f5fc363e2510f6943532f3e14a6423f6a2cf1 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 31 Jul 2018 17:24:47 +0800 | 3 | Date: Tue, 31 Jul 2018 17:24:47 +0800 |
4 | Subject: [PATCH 1/4] support authentication for kickstart | 4 | Subject: [PATCH 1/4] support authentication for kickstart |
@@ -51,7 +51,7 @@ index bf08ac5..aada7aa 100644 | |||
51 | + def __str__(self): | 51 | + def __str__(self): |
52 | + return self.value | 52 | + return self.value |
53 | diff --git a/pykickstart/load.py b/pykickstart/load.py | 53 | diff --git a/pykickstart/load.py b/pykickstart/load.py |
54 | index fb935f2..c6f013f 100644 | 54 | index fb935f2..41a2e9e 100644 |
55 | --- a/pykickstart/load.py | 55 | --- a/pykickstart/load.py |
56 | +++ b/pykickstart/load.py | 56 | +++ b/pykickstart/load.py |
57 | @@ -18,10 +18,13 @@ | 57 | @@ -18,10 +18,13 @@ |
@@ -101,7 +101,7 @@ index fb935f2..c6f013f 100644 | |||
101 | + if user is None or passwd is None: | 101 | + if user is None or passwd is None: |
102 | + log.info("Require Authentication") | 102 | + log.info("Require Authentication") |
103 | + raise KickstartAuthError("Require Authentication.\nAppend 'ksuser=<username> kspasswd=<password>' to boot command") | 103 | + raise KickstartAuthError("Require Authentication.\nAppend 'ksuser=<username> kspasswd=<password>' to boot command") |
104 | + | 104 | |
105 | + reasons = request.headers.get("WWW-Authenticate", "").split() | 105 | + reasons = request.headers.get("WWW-Authenticate", "").split() |
106 | + if reasons: | 106 | + if reasons: |
107 | + auth_type = reasons[0] | 107 | + auth_type = reasons[0] |
@@ -111,9 +111,9 @@ index fb935f2..c6f013f 100644 | |||
111 | + auth=HTTPDigestAuth(user, passwd) | 111 | + auth=HTTPDigestAuth(user, passwd) |
112 | + | 112 | + |
113 | + return auth | 113 | + return auth |
114 | 114 | + | |
115 | +def _load_url(location, user=None, passwd=None): | 115 | +def _load_url(location, user=None, passwd=None): |
116 | + '''Load a location (URL or filename) and return contents as string''' | 116 | + '''Load a location (URL or filename) and return contents as string''' |
117 | + auth = _get_auth(location, user=user, passwd=passwd) | 117 | + auth = _get_auth(location, user=user, passwd=passwd) |
118 | try: | 118 | try: |
119 | - request = requests.get(location, verify=SSL_VERIFY) | 119 | - request = requests.get(location, verify=SSL_VERIFY) |
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 c950be638..6ed15ab09 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,4 +1,4 @@ | |||
1 | From a86ba22d7133199d850ef3d893571f27d6b0faed Mon Sep 17 00:00:00 2001 | 1 | From ffe06c6dd812b604d6482e4353d5564fad78bc90 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Mon, 30 Jul 2018 15:52:21 +0800 | 3 | Date: Mon, 30 Jul 2018 15:52:21 +0800 |
4 | Subject: [PATCH 4/4] load.py: retry to invoke request with timeout | 4 | Subject: [PATCH 4/4] load.py: retry to invoke request with timeout |
@@ -16,7 +16,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
16 | 1 file changed, 31 insertions(+) | 16 | 1 file changed, 31 insertions(+) |
17 | 17 | ||
18 | diff --git a/pykickstart/load.py b/pykickstart/load.py | 18 | diff --git a/pykickstart/load.py b/pykickstart/load.py |
19 | index 7adb751..b62245e 100644 | 19 | index ad3bad1..a5cbbc5 100644 |
20 | --- a/pykickstart/load.py | 20 | --- a/pykickstart/load.py |
21 | +++ b/pykickstart/load.py | 21 | +++ b/pykickstart/load.py |
22 | @@ -21,6 +21,7 @@ import requests | 22 | @@ -21,6 +21,7 @@ import requests |
@@ -70,7 +70,7 @@ index 7adb751..b62245e 100644 | |||
70 | @@ -94,6 +121,10 @@ def _get_auth(location, user=None, passwd=None): | 70 | @@ -94,6 +121,10 @@ def _get_auth(location, user=None, passwd=None): |
71 | 71 | ||
72 | def _load_url(location, user=None, passwd=None): | 72 | def _load_url(location, user=None, passwd=None): |
73 | '''Load a location (URL or filename) and return contents as string''' | 73 | '''Load a location (URL or filename) and return contents as string''' |
74 | + | 74 | + |
75 | + if not _access_url(location): | 75 | + if not _access_url(location): |
76 | + raise KickstartError(_("Connection %s failed" % location)) | 76 | + raise KickstartError(_("Connection %s failed" % location)) |