diff --git a/pykickstart/0001-Default-to-the-F21-version-of-kickstart-syntax.patch b/pykickstart/0001-Default-to-the-F21-version-of-kickstart-syntax.patch new file mode 100644 index 0000000..fd62ca4 --- /dev/null +++ b/pykickstart/0001-Default-to-the-F21-version-of-kickstart-syntax.patch @@ -0,0 +1,44 @@ +diff -ruN pykickstart-1.99.63.orig/pykickstart/version.py pykickstart-1.99.63/pykickstart/version.py +--- pykickstart-1.99.63.orig/pykickstart/version.py 2014-10-13 11:22:47.053181434 -0400 ++++ pykickstart-1.99.63/pykickstart/version.py 2014-10-13 11:22:53.773239001 -0400 +@@ -78,8 +78,8 @@ + F21 = 19000 + F22 = 20000 + +-# This always points at the latest version and is the default. +-DEVEL = F22 ++# Point to the proper version of kickstart syntax for this release. ++DEVEL = F21 + + # A one-to-one mapping from string representations to version numbers. + versionMap = { +diff -ruN pykickstart-1.99.63.orig/tests/version.py pykickstart-1.99.63/tests/version.py +--- pykickstart-1.99.63.orig/tests/version.py 2014-10-13 11:22:47.066181228 -0400 ++++ pykickstart-1.99.63/tests/version.py 2014-10-13 11:23:24.882507493 -0400 +@@ -148,17 +148,6 @@ + + class VersionToString_TestCase(CommandTest): + def runTest(self): +- +- # Make sure DEVEL is the highest version, but RHEL versions aren't +- # counted as devel. +- highest = 0 +- for (ver_str,ver_num) in list(versionMap.items()): +- if ver_str.startswith("RHEL"): +- continue +- +- highest = max(ver_num, highest) +- self.assertEqual(highest, DEVEL) +- + # FC series + self.assertEqual(versionToString(FC3), "FC3") + self.assertEqual(versionToString(FC4), "FC4") +@@ -184,7 +173,7 @@ + self.assertEqual(versionToString(F20, skipDevel=True), "F20") + self.assertEqual(versionToString(F21, skipDevel=True), "F21") + self.assertEqual(versionToString(F22, skipDevel=True), "F22") +- self.assertEqual(versionToString(F22, skipDevel=False), "DEVEL") ++ self.assertEqual(versionToString(F21, skipDevel=False), "DEVEL") + # RHEL series + self.assertEqual(versionToString(RHEL3), "RHEL3") + self.assertEqual(versionToString(RHEL4), "RHEL4") diff --git a/pykickstart/pykickstart-1.99.48.tar.gz b/pykickstart/pykickstart-1.99.48.tar.gz deleted file mode 100644 index e0b65e9..0000000 Binary files a/pykickstart/pykickstart-1.99.48.tar.gz and /dev/null differ diff --git a/pykickstart/pykickstart-1.99.65.tar.gz b/pykickstart/pykickstart-1.99.65.tar.gz new file mode 100644 index 0000000..b148b70 Binary files /dev/null and b/pykickstart/pykickstart-1.99.65.tar.gz differ diff --git a/pykickstart/pykickstart.spec b/pykickstart/pykickstart.spec index a5b18de..48e9a3b 100644 --- a/pykickstart/pykickstart.spec +++ b/pykickstart/pykickstart.spec @@ -7,13 +7,14 @@ Summary: A python library for manipulating kickstart files Name: pykickstart Url: http://fedoraproject.org/wiki/pykickstart -Version: 1.99.48 -Release: 1.2%{?dist} +Version: 1.99.65 +Release: 2.2%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. Source0: %{name}-%{version}.tar.gz -Patch0: repo-gpgkey-option.patch +Patch0: 0001-Default-to-the-F21-version-of-kickstart-syntax.patch +Patch1: repo-gpgkey-option.patch License: GPLv2 Group: System Environment/Libraries @@ -34,6 +35,7 @@ files. %setup -q %patch0 -p1 +%patch1 -p1 %build make @@ -48,7 +50,7 @@ rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) -%doc README ChangeLog COPYING docs/programmers-guide +%doc README COPYING docs/programmers-guide %doc docs/kickstart-docs.txt %{python_sitelib}/* %{_bindir}/ksvalidator @@ -58,6 +60,110 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Fri Dec 19 2014 Chris Lumens 1.99.65-2 +- Rebuild for F21. + +* Mon Dec 15 2014 Chris Lumens - 1.99.65-1 +- Add support for setting user account ssh key (bcl) +- Add = to the output for various network options (#1171926). (clumens) +- When ksflatten fails, return a failure code (#1162881). (clumens) + +* Mon Nov 24 2014 Chris Lumens - 1.99.64-1 +- Get rid of an unused variable. (clumens) +- network: add support for bridge to RHEL7 (#1075195) (rvykydal) +- Add new RHEL7 logvol objects to master (vpodzime) +- Add new RHEL7 volgroup objects to master (vpodzime) +- RHEL7 supports the ostreesetup command. (clumens) + +* Mon Oct 13 2014 Chris Lumens 1.99.63-2 +- Rebuild for F20. + +* Fri Oct 10 2014 Chris Lumens - 1.99.63-1 +- Move the test for --nombr option to the right class (vpodzime) +- Add the --nombr bootloader option in pykickstart (gczarcinski) + +* Tue Oct 07 2014 Chris Lumens - 1.99.62-1 +- Allow recommended flag for non-prexisting logical volumes (#1149718) (amulhern) +- Apply a couple more 2to3 fixes, still avoiding the hard ones.(#985310). (clumens) +- Apply the obvious easy changes from 2to3 (#985310). (clumens) + +* Fri Oct 03 2014 Chris Lumens - 1.99.61-1 +- Add support for specifying thin pool profile (vpodzime) +- Add missing import (mkolman) +- Add tests for --interfacename validation (mkolman) +- Validate network interface name when parsing the kickstart (#1081982) (mkolman) + +* Thu Sep 25 2014 Chris Lumens 1.99.60-2 +- Add a patch to default to F21 syntax. + +* Wed Sep 24 2014 Chris Lumens - 1.99.60-1 +- Make --size and --percent mutually exclusive in logvol. (dlehman) +- Add support for F22. (clumens) + +* Wed Sep 17 2014 Chris Lumens - 1.99.59-1 +- Some tests for --size and --percent (#1117908) (amulhern) +- Update tests where necessary with --size flag (#1117908) (amulhern) +- Supply regex values for assert_parse_error calls in logvol.py (#1117908) (amulhern) +- Check the regular expression when asserting a parse error (#1117908) (amulhern) +- Do not reference non-existant attribute (#1117908) (amulhern) +- Move some statically detectable kickstart errors out of anaconda (#1117908) (amulhern) +- Remove --disable-override from tx arguments. (clumens) +- Add the bootloader --disabled option for RHEL7 as well. (clumens) + +* Tue Aug 12 2014 Chris Lumens - 1.99.58-1 +- Add --install flag to repo command (#1119867) (bcl) + +* Wed Jul 02 2014 Chris Lumens - 1.99.57-1 +- Replace python-setuptools-devel BR with python-setuptools (toshio). (clumens) +- Add autopart --fstype support (#1112697) (bcl) +- Add some more tests to bump up the "make coverage" numbers. (clumens) + +* Thu Jun 19 2014 Chris Lumens - 1.99.56-1 +- Add support for --disklabel to clearpart (#1078537) (bcl) +- Make print statements Python 3 compatible (mkolman) + +* Fri May 16 2014 Chris Lumens - 1.99.55-1 +- Do not set any magic default PE size in pykickstart (vpodzime) +- ostreesetup: Fix noGpg attribute (walters) +- Fix bogus changelog in pykickstart.spec (sagarun) +- Stop shipping a ChangeLog file. (clumens) +- We can use descriptive pylint message names on the command line, too. (clumens) + +* Tue Apr 22 2014 Chris Lumens - 1.99.54-1 +- Move ks tools from optparse to argparse (#1083913). (clumens) +- Use descriptive pylint messages instead of numbers. (clumens) +- Fix up some printing problems in some of the tools. (clumens) +- Add support for the --listversions option to ksverdiff too. (clumens) +- Run pylint on tools/, and fix up all the errors. (clumens) +- disable-msg -> disable for pylint. (clumens) + +* Mon Mar 31 2014 Chris Lumens - 1.99.53-1 +- ostreesetup: New command (walters) +- Move commandMap and dataMap setting into the individual handler classes. (clumens) + +* Fri Mar 21 2014 Chris Lumens - 1.99.52-1 +- Take care of all the unused argument warnings. (clumens) +- Take care of all the unused variable warnings. (clumens) +- Remove unused imports. (clumens) +- Don't do relative import any more, either. (clumens) +- Stop doing wildcard imports. (clumens) +- Add an option to disable even installing the core group. (clumens) + +* Tue Mar 18 2014 Chris Lumens - 1.99.51-1 +- Use the correct indentation for the new network stuff. (clumens) +- Add network --interfacename option for vlans (#1061646) (rvykydal) + +* Mon Mar 17 2014 Chris Lumens - 1.99.50-1 +- Add a new bootloader --disabled option (#1074522). (clumens) +- Add support for F21. (clumens) +- Fix an error on the printing side of handling environments. (clumens) +- Add support for fcoe --autovlan option (#1055779) (rvykydal) + +* Wed Feb 05 2014 Chris Lumens - 1.99.49-1 +- Provide syntax for specifying environments (#1061296). (clumens) +- Use the correct LogVolData object (#1058520). (clumens) +- Don't do string comparisons in "make test" (#1057573). (clumens) + * Mon Nov 25 2013 Chris Lumens - 1.99.48-1 - Specify a kickstart version when running package-related tests. (clumens) - We need python-urlgrabber to do builds now. (clumens) @@ -889,7 +995,7 @@ rm -rf %{buildroot} - Make ksvalidator validate from a URL in addition to a file. - Don't write out an empty packages section (#192851). -* Tue May 23 2006 Chris Lumens 0.29-1 +* Thu May 23 2006 Chris Lumens 0.29-1 - Add multipath command, handlers, and data objects (pjones). - Rename --ports to --port in writer. diff --git a/pykickstart/repo-gpgkey-option.patch b/pykickstart/repo-gpgkey-option.patch index 76a69f7..c4d27e5 100644 --- a/pykickstart/repo-gpgkey-option.patch +++ b/pykickstart/repo-gpgkey-option.patch @@ -8,7 +8,7 @@ Index: pykickstart-1.99.22/pykickstart/commands/repo.py =================================================================== --- pykickstart-1.99.22.orig/pykickstart/commands/repo.py +++ pykickstart-1.99.22/pykickstart/commands/repo.py -@@ -131,7 +131,22 @@ class F14_RepoData(F13_RepoData): +@@ -130,9 +130,24 @@ RHEL6_RepoData = F14_RepoData @@ -23,22 +23,27 @@ Index: pykickstart-1.99.22/pykickstart/commands/repo.py + + def _getArgsAsStr(self): + retval = F14_RepoData._getArgsAsStr(self) -+ + +-class F21_RepoData(F14_RepoData): + if self.gpgkey: + retval += " --gpgkey=\"%s\"" % self.gpgkey + + return retval + ++ ++class F21_RepoData(F15_RepoData): + removedKeywords = F14_RepoData.removedKeywords + removedAttrs = F14_RepoData.removedAttrs - class FC6_Repo(KickstartCommand): - removedKeywords = KickstartCommand.removedKeywords -@@ -253,3 +268,9 @@ class F15_Repo(F14_Repo): - removedAttrs = F14_Repo.removedAttrs +@@ -271,6 +286,11 @@ urlRequired = False -+ + + def _getParser(self): + op = F14_Repo._getParser(self) + op.add_option("--gpgkey", action="store", type="string") + return op + + class F21_Repo(F15_Repo): + removedKeywords = F15_Repo.removedKeywords + removedAttrs = F15_Repo.removedAttrs