Rebuild the latest pykickstart for f21 branch.

This is primarily to pick up the ksflatten exit code fix.

.gitignore

@@ -132,3 +132,8 @@ pykickstart-1.78.tar.gz
 /pykickstart-1.99.58.tar.gz
 /pykickstart-1.99.59.tar.gz
 /pykickstart-1.99.60.tar.gz
+/pykickstart-1.99.61.tar.gz
+/pykickstart-1.99.62.tar.gz
+/pykickstart-1.99.63.tar.gz
+/pykickstart-1.99.64.tar.gz
+/pykickstart-1.99.65.tar.gz

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")

pykickstart.spec

@@ -3,12 +3,13 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.99.60
-Release: 1%{?dist}
+Version: 1.99.65
+Release: 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: 0001-Default-to-the-F21-version-of-kickstart-syntax.patch
 
 License: GPLv2
 Group: System Environment/Libraries
@@ -27,6 +28,7 @@ files.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -54,6 +56,42 @@ make test
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 19 2014 Chris Lumens <clumens@redhat.com> 1.99.65-2
+- Rebuild for F21.
+
+* Mon Dec 15 2014 Chris Lumens <clumens@redhat.com> - 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 <clumens@redhat.com> - 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 <clumens@redhat.com> 1.99.63-2
+- Rebuild for F20.
+
+* Fri Oct 10 2014 Chris Lumens <clumens@redhat.com> - 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 <clumens@redhat.com> - 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 <clumens@redhat.com> - 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 <clumens@redhat.com> 1.99.60-2
+- Add a patch to default to F21 syntax.
+
 * Wed Sep 24 2014 Chris Lumens <clumens@redhat.com> - 1.99.60-1
 - Make --size and --percent mutually exclusive in logvol. (dlehman)
 - Add support for F22. (clumens)

sources

@@ -1 +1 @@
-b1354ebc3f2dac1ab79ff14772cb3e90  pykickstart-1.99.60.tar.gz
+883a2ceb9e6a8a78943eac33feb4a030  pykickstart-1.99.65.tar.gz