From b089140d17ceb9b5d972c0c8b21527bece6e1321 Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Fri, 7 Apr 2017 15:50:06 -0400 Subject: [PATCH 1/3] - Ignore a couple false positives coming from the re module. (clumens) - Add --nohome, --noboot and --noswap options to autopart command. (vponcova) - Add --nohome option to autopart command to RHEL7. (vponcova) - Add support for --chunksize option to RHEL7. (vponcova) - Ignore errors from coverage tests (#138) (jkonecny) - Add --hibernation to the list of logvol size options (#1408666). (clumens) - Apply a different filter for warnings from pykickstart (#1408667). (clumens) - Rename a couple _setToSelf calls that snuck back in (#1408667). (clumens) - Handle KickstartVersionError in ksflatten (#1412249). (clumens) - Fix handling # in passwords. (clumens) - Pass comments=True to shlex.split calls in the test functions. (clumens) --- .gitignore | 1 + pykickstart.spec | 21 ++++++++++++++------- sources | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 63cbd97..214a705 100644 --- a/.gitignore +++ b/.gitignore @@ -171,3 +171,4 @@ pykickstart-1.78.tar.gz /pykickstart-2.31.tar.gz /pykickstart-2.32.tar.gz /pykickstart-2.33.tar.gz +/pykickstart-2.34.tar.gz diff --git a/pykickstart.spec b/pykickstart.spec index 30a975b..8909844 100644 --- a/pykickstart.spec +++ b/pykickstart.spec @@ -1,6 +1,6 @@ Name: pykickstart -Version: 2.33 -Release: 3%{?dist} +Version: 2.34 +Release: 1%{?dist} License: GPLv2 and MIT Group: System Environment/Libraries Summary: Python utilities for manipulating kickstart files. @@ -121,11 +121,18 @@ popd %{python3_sitelib}/pykickstart/locale/ %changelog -* Sat Feb 11 2017 Fedora Release Engineering - 2.33-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Dec 13 2016 Charalampos Stratakis - 2.33-2 -- Rebuild for Python 3.6 +* Fri Apr 07 2017 Chris Lumens - 2.34-1 +- Ignore a couple false positives coming from the re module. (clumens) +- Add --nohome, --noboot and --noswap options to autopart command. (vponcova) +- Add --nohome option to autopart command to RHEL7. (vponcova) +- Add support for --chunksize option to RHEL7. (vponcova) +- Ignore errors from coverage tests (#138) (jkonecny) +- Add --hibernation to the list of logvol size options (#1408666). (clumens) +- Apply a different filter for warnings from pykickstart (#1408667). (clumens) +- Rename a couple _setToSelf calls that snuck back in (#1408667). (clumens) +- Handle KickstartVersionError in ksflatten (#1412249). (clumens) +- Fix handling # in passwords. (clumens) +- Pass comments=True to shlex.split calls in the test functions. (clumens) * Fri Nov 04 2016 Chris Lumens - 2.33-1 - Fix python2 compatibility when printing to stderr (jkonecny) diff --git a/sources b/sources index 45471ba..17074d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5875862b84d16e1ce69c001d32e7ed1 pykickstart-2.33.tar.gz +SHA512 (pykickstart-2.34.tar.gz) = 783a28139396351cf9a02db7d92bc5d032e4d23dda4245a3b237c3550dc84d4f3398658bafae48e282b65a0c5b42718a1a8ed86f8f848d0df9fa1ffc3e31d895 From 5d0be2cee4a30d1deab2eeb942a684eec11ed5d0 Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Wed, 14 Jun 2017 10:22:01 -0400 Subject: [PATCH 2/3] - Fix an ambiguous string in a snapshot command test. (clumens) - Snapshot command is also for Fedora 26 (jkonecny) - Add documentation for the snapshot feature (#1113207) (jkonecny) - Add tests for a new snapshot command (#1113207) (jkonecny) - Add support of --when param to snapshot command (#1113207) (jkonecny) - Add new snapshot KS command (#1113207) (jkonecny) --- .gitignore | 1 + pykickstart.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 214a705..80312f8 100644 --- a/.gitignore +++ b/.gitignore @@ -172,3 +172,4 @@ pykickstart-1.78.tar.gz /pykickstart-2.32.tar.gz /pykickstart-2.33.tar.gz /pykickstart-2.34.tar.gz +/pykickstart-2.35.tar.gz diff --git a/pykickstart.spec b/pykickstart.spec index 8909844..733b9be 100644 --- a/pykickstart.spec +++ b/pykickstart.spec @@ -1,5 +1,5 @@ Name: pykickstart -Version: 2.34 +Version: 2.35 Release: 1%{?dist} License: GPLv2 and MIT Group: System Environment/Libraries @@ -121,6 +121,14 @@ popd %{python3_sitelib}/pykickstart/locale/ %changelog +* Wed Jun 14 2017 Chris Lumens - 2.35-1 +- Fix an ambiguous string in a snapshot command test. (clumens) +- Snapshot command is also for Fedora 26 (jkonecny) +- Add documentation for the snapshot feature (#1113207) (jkonecny) +- Add tests for a new snapshot command (#1113207) (jkonecny) +- Add support of --when param to snapshot command (#1113207) (jkonecny) +- Add new snapshot KS command (#1113207) (jkonecny) + * Fri Apr 07 2017 Chris Lumens - 2.34-1 - Ignore a couple false positives coming from the re module. (clumens) - Add --nohome, --noboot and --noswap options to autopart command. (vponcova) diff --git a/sources b/sources index 17074d7..34648d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pykickstart-2.34.tar.gz) = 783a28139396351cf9a02db7d92bc5d032e4d23dda4245a3b237c3550dc84d4f3398658bafae48e282b65a0c5b42718a1a8ed86f8f848d0df9fa1ffc3e31d895 +SHA512 (pykickstart-2.35.tar.gz) = 5c90e199776693e118b2445fc19bdd6262a0d555116baeccb99c2fcad9660753834fb7a65d4ac780dc3415e67d3b309a3573a3b6dbd0a5b43828ddab08c65cf9 From 30b0c015045fce245e26bbf19acd8ab54d1f309d Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Thu, 19 Oct 2017 11:43:52 -0400 Subject: [PATCH 3/3] Add a patch to fix builds against python 3.6.3 (jkonecny). Gettext can sometimes return bytes which needs to be converted and this is handled in the i18n.py source file. --- 0001-Call-the-_-method-from-i18n.py.patch | 27 +++++++++++++++++++++++ 0002-Disable-translation-canary.patch | 12 ++++++++++ pykickstart.spec | 9 +++++++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 0001-Call-the-_-method-from-i18n.py.patch create mode 100644 0002-Disable-translation-canary.patch diff --git a/0001-Call-the-_-method-from-i18n.py.patch b/0001-Call-the-_-method-from-i18n.py.patch new file mode 100644 index 0000000..8d64b73 --- /dev/null +++ b/0001-Call-the-_-method-from-i18n.py.patch @@ -0,0 +1,27 @@ +diff -ruN pykickstart-2.35.orig/pykickstart/commands/reqpart.py pykickstart-2.35/pykickstart/commands/reqpart.py +--- pykickstart-2.35.orig/pykickstart/commands/reqpart.py 2017-10-19 11:25:41.982773586 -0400 ++++ pykickstart-2.35/pykickstart/commands/reqpart.py 2017-10-19 11:34:38.258364922 -0400 +@@ -21,9 +21,7 @@ + from pykickstart.errors import KickstartParseError, formatErrorMsg + from pykickstart.options import KSOptionParser + +-import gettext +-# typeshed is missing the stub for ldgettext +-_ = lambda x: gettext.ldgettext("pykickstart", x) # type: ignore ++from pykickstart.i18n import _ + + class F23_ReqPart(KickstartCommand): + removedKeywords = KickstartCommand.removedKeywords +diff -ruN pykickstart-2.35.orig/pykickstart/commands/snapshot.py pykickstart-2.35/pykickstart/commands/snapshot.py +--- pykickstart-2.35.orig/pykickstart/commands/snapshot.py 2017-10-19 11:25:41.982773586 -0400 ++++ pykickstart-2.35/pykickstart/commands/snapshot.py 2017-10-19 11:34:47.977448130 -0400 +@@ -23,8 +23,7 @@ + from pykickstart.options import KSOptionParser + from pykickstart.constants import SNAPSHOT_WHEN_POST_INSTALL, SNAPSHOT_WHEN_PRE_INSTALL + +-import gettext +-_ = lambda x: gettext.ldgettext("pykickstart", x) ++from pykickstart.i18n import _ + + class RHEL7_SnapshotData(BaseData): + removedKeywords = BaseData.removedKeywords diff --git a/0002-Disable-translation-canary.patch b/0002-Disable-translation-canary.patch new file mode 100644 index 0000000..0983998 --- /dev/null +++ b/0002-Disable-translation-canary.patch @@ -0,0 +1,12 @@ +diff -ruN pykickstart-2.35.orig/po/Makefile pykickstart-2.35/po/Makefile +--- pykickstart-2.35.orig/po/Makefile 2017-10-19 12:52:22.672153378 -0400 ++++ pykickstart-2.35/po/Makefile 2017-10-19 12:52:32.443236072 -0400 +@@ -12,7 +12,7 @@ + + # PO catalog handling + MSGMERGE = msgmerge -v +-XGETTEXT = ../translation-canary/xgettext_werror.sh --default-domain=$(NLSPACKAGE) \ ++XGETTEXT = xgettext --default-domain=$(NLSPACKAGE) \ + --add-comments + MSGFMT = msgfmt --statistics --verbose + diff --git a/pykickstart.spec b/pykickstart.spec index 733b9be..cbcecf1 100644 --- a/pykickstart.spec +++ b/pykickstart.spec @@ -1,6 +1,6 @@ Name: pykickstart Version: 2.35 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and MIT Group: System Environment/Libraries Summary: Python utilities for manipulating kickstart files. @@ -9,6 +9,8 @@ Url: http://fedoraproject.org/wiki/pykickstart # our distribution. Thus the source is only available from # within this srpm. Source0: %{name}-%{version}.tar.gz +Patch0: 0001-Call-the-_-method-from-i18n.py.patch +Patch1: 0002-Disable-translation-canary.patch BuildArch: noarch @@ -60,6 +62,8 @@ the pykickstart package. %prep %setup -q +%patch0 -p1 +%patch1 -p1 rm -rf %{py3dir} mkdir %{py3dir} @@ -121,6 +125,9 @@ popd %{python3_sitelib}/pykickstart/locale/ %changelog +* Thu Oct 19 2017 Chris Lumens - 2.35-2 +- Add a patch to fix builds against python 3.6.3 (jkonecny). + * Wed Jun 14 2017 Chris Lumens - 2.35-1 - Fix an ambiguous string in a snapshot command test. (clumens) - Snapshot command is also for Fedora 26 (jkonecny)