From 600c5d6a3a3f09e35306dcf6c9970b71a91da86e Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 9 Apr 2025 17:37:48 +0800 Subject: python3-pykickstart: Upgrade 3.48 -> 3.62 License-update: Remove control characters from license [1]. Remove one backported patch. Changelog: https://github.com/pykickstart/pykickstart/releases [1] https://github.com/pykickstart/pykickstart/commit/6f35a9eedabf33c9b27317449848333ead3a3c6b Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- ...art-parser.py-add-lock-for-readKickstart-and.patch | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch') diff --git a/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch b/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch index f5483db825..cf5dd95d48 100644 --- a/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch +++ b/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch @@ -1,8 +1,8 @@ -From 62fdead139edb0f29b2f222efcb8f39be15b057e Mon Sep 17 00:00:00 2001 +From 42076483ed38d50400156cbb75d4c9b0180e6957 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 30 Jul 2018 15:47:13 +0800 -Subject: [PATCH 2/4] pykickstart/parser.py: add lock for readKickstart and - support https without certification +Subject: [PATCH] pykickstart/parser.py: add lock for readKickstart and support + https without certification - Add lock for readKickstart to fix race issue @@ -13,15 +13,18 @@ Signed-off-by: Wang Mingyu --- Upstream-Status: Pending +Rebase to 3.62 +Signed-off-by: Mingli Yu +--- pykickstart/load.py | 2 +- pykickstart/parser.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pykickstart/load.py b/pykickstart/load.py -index 8da8051..e856c8d 100644 +index 45d402a..6eeffde 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py -@@ -32,7 +32,7 @@ log = logging.getLogger("anaconda.main") +@@ -28,7 +28,7 @@ from requests.exceptions import SSLError, RequestException is_url = lambda location: '://' in location # RFC 3986 @@ -31,10 +34,10 @@ index 8da8051..e856c8d 100644 def load_to_str(location, user=None, passwd=None): '''Load a destination URL or file into a string. diff --git a/pykickstart/parser.py b/pykickstart/parser.py -index b95ba90..a55a9a3 100644 +index 351dc1b..aef59ca 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -51,6 +51,20 @@ from pykickstart.i18n import _ +@@ -54,6 +54,20 @@ from pykickstart.i18n import _ STATE_END = "end" STATE_COMMANDS = "commands" @@ -55,7 +58,7 @@ index b95ba90..a55a9a3 100644 def _preprocessStateMachine(lineIter): l = None lineno = 0 -@@ -791,6 +805,10 @@ class KickstartParser(object): +@@ -832,6 +846,10 @@ class KickstartParser(object): self._stateMachine(i) def readKickstart(self, f, reset=True, username=None, password=None): -- cgit v1.2.3-54-g00ecf