From c64a73b3edaaccde08be9d4f543c225f7e7bf686 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Thu, 9 Jul 2020 15:54:59 +0800 Subject: python3-pykickstart: 3.22 -> 3.26 Update python3-pykickstart from 3.22 to 3.26. * Update context of 0001-support-authentication-for-kickstart.patch Signed-off-by: Kai Kang Acked-by: Trevor Gamblin Signed-off-by: Khem Raj --- ...0001-support-authentication-for-kickstart.patch | 10 ++++----- .../python-pykickstart/python3-pykickstart_3.22.bb | 25 ---------------------- .../python-pykickstart/python3-pykickstart_3.26.bb | 25 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb create mode 100644 meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb (limited to 'meta-python/recipes-extended/python-pykickstart') 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 e7533f4769..0e64ce420e 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 @@ -32,10 +32,10 @@ index bf08ac5..aada7aa 100644 And some warning classes: KickstartWarning - A generic warning class. -@@ -131,3 +134,17 @@ class KickstartDeprecationWarning(KickstartParseWarning, DeprecationWarning): +@@ -125,3 +128,17 @@ class KickstartDeprecationWarning(KickstartParseWarning, DeprecationWarning): + """A class for warnings occurring during parsing related to using deprecated commands and options. """ - pass + +class KickstartAuthError(KickstartError): + """An exception for errors relating to authentication failed while @@ -43,7 +43,7 @@ index bf08ac5..aada7aa 100644 + """ + def __init__(self, msg): + """Create a new KickstartAuthError exception instance with the -+ descriptive message val. val should be the return value of ++ descriptive message val. val should be the return value of + formatErrorMsg. + """ + KickstartError.__init__(self, msg) @@ -125,7 +125,7 @@ diff --git a/pykickstart/parser.py b/pykickstart/parser.py index d8880eb..22d14cb 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -787,7 +787,7 @@ class KickstartParser(object): +@@ -801,7 +801,7 @@ class KickstartParser(object): i = PutBackIterator(s.splitlines(True) + [""]) self._stateMachine(i) @@ -134,7 +134,7 @@ index d8880eb..22d14cb 100644 """Process a kickstart file, given by the filename f.""" if reset: self._reset() -@@ -808,7 +808,7 @@ class KickstartParser(object): +@@ -822,7 +822,7 @@ class KickstartParser(object): self.currentdir[self._includeDepth] = cd try: diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb deleted file mode 100644 index 041abd3e8d..0000000000 --- a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "A python library for manipulating kickstart files" -HOMEPAGE = "http://fedoraproject.org/wiki/pykickstart" -LICENSE = "GPLv2+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -DEPENDS = "python3" -RDEPENDS_${PN} = "python3 \ - python3-requests \ - python3-six \ -" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=master \ - file://0001-support-authentication-for-kickstart.patch \ - file://0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch \ - file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ - file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ - " -SRCREV = "674c17b1e231f56a0d8a5ced4a204cdbc4c1edf3" - -UPSTREAM_CHECK_GITTAGREGEX = "r(?P\d+(\.\d+)+(-\d+)*)" - -inherit setuptools3 diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb new file mode 100644 index 0000000000..7aeb5d6c99 --- /dev/null +++ b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "A python library for manipulating kickstart files" +HOMEPAGE = "http://fedoraproject.org/wiki/pykickstart" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +DEPENDS = "python3" +RDEPENDS_${PN} = "python3 \ + python3-requests \ + python3-six \ +" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=master \ + file://0001-support-authentication-for-kickstart.patch \ + file://0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch \ + file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ + file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ + " +SRCREV = "4c93e84c8798da511da1c05f1912d2f908f8f85f" + +UPSTREAM_CHECK_GITTAGREGEX = "r(?P\d+(\.\d+)+(-\d+)*)" + +inherit setuptools3 -- cgit v1.2.3-54-g00ecf