diff --git a/.gitignore b/.gitignore
index 0ac065c..9f88161 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/pykickstart-1.99.43.17.tar.gz
+SOURCES/pykickstart-1.99.66.6.tar.gz
diff --git a/.pykickstart.metadata b/.pykickstart.metadata
index ccf7a68..78137b9 100644
--- a/.pykickstart.metadata
+++ b/.pykickstart.metadata
@@ -1 +1 @@
-590158998db4eb86711d0d1f1984350376025890 SOURCES/pykickstart-1.99.43.17.tar.gz
+d04ae3d0b22b7afd0d67bce4051907b63e357616 SOURCES/pykickstart-1.99.66.6.tar.gz
diff --git a/SPECS/pykickstart.spec b/SPECS/pykickstart.spec
index c473a91..57902df 100644
--- a/SPECS/pykickstart.spec
+++ b/SPECS/pykickstart.spec
@@ -1,9 +1,9 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
Summary: A python library for manipulating kickstart files
Name: pykickstart
Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.99.43.17
+Version: 1.99.66.6
Release: 1%{?dist}
# This is a Red Hat maintained package which is specific to
# our distribution. Thus the source is only available from
@@ -14,11 +14,8 @@ License: GPLv2
Group: System Environment/Libraries
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel, gettext, python-setuptools-devel
+BuildRequires: python-devel, gettext, python-setuptools
BuildRequires: python-urlgrabber
-%if ! 0%{?rhel}
-BuildRequires: transifex-client
-%endif
Requires: python, python-urlgrabber
%description
@@ -44,8 +41,9 @@ make test
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc README ChangeLog COPYING docs/programmers-guide
-%doc docs/kickstart-docs.txt
+%license COPYING
+%doc README docs/programmers-guide
+%doc docs/kickstart-docs.rst
%{python_sitelib}/*
%{_bindir}/ksvalidator
%{_bindir}/ksflatten
@@ -54,75 +52,159 @@ make test
%{_mandir}/man1/*
%changelog
-* Tue Oct 07 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.17-1
+* Tue Sep 22 2015 Chris Lumens <clumens@redhat.com> - 1.99.66.6-1
+- Update the RHEL7 version constant. (clumens)
+
+* Tue Jul 07 2015 Chris Lumens <clumens@redhat.com> - 1.99.66.5-1
+- Reorder the expected output in the clearpart CDL test. (clumens)
+- Fix whitespace error in clearpart --cdl test (#1232849) (sbueno+anaconda)
+- Add clearpart --cdl option. (#1232849) (sbueno+anaconda)
+- Avoid polluting generated kickstarts by unexpected reqpart commands (#1164660) (mkolman)
+- Don't allow using --fsprofile and --mkfsopts at the same time. (clumens)
+
+* Wed Jun 24 2015 Chris Lumens <clumens@redhat.com> - 1.99.66.4-1
+- transifex-client is no longer needed to build. (clumens)
+- Add kickstart docs to the source tree (clumens)
+- Add options for LVM cache specs to the 'logvol' command (vpodzime)
+
+* Thu Jun 18 2015 Chris Lumens <clumens@redhat.com> - 1.99.66.3-1
+- Add --mkfsoptions to btrfs, logvol, partition, and raid commands. (clumens)
+- Merge pull request #25 from bcl/rhel7-1207747 (clumens)
+- Allow skipping the errors on unknown sections. (#1180255) (sbueno+anaconda)
+- Add --kexec flag to reboot (#1207747) (bcl)
+
+* Tue Jun 02 2015 Chris Lumens <clumens@redhat.com> - 1.99.66.2-1
+- Add rc-release Makefile target (bcl)
+- Add a new command to only make those partitions required by the platform. (clumens)
+
+* Tue Apr 28 2015 Chris Lumens <clumens@redhat.com> - 1.99.66.1-1
+- Rebuild for RHEL7.
+
+* Fri Jan 30 2015 Chris Lumens <clumens@redhat.com> - 1.99.66-1
+- network: add support for bridge to F22 (#1075195) (rvykydal)
+- Use %license in pykickstart.spec (bcl)
+
+* 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)
+
+* 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)
-* Thu Oct 02 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.16-1
+* 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)
-* Tue Sep 30 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.15-1
-- network: add support for bridge (#1075195) (rvykydal)
+* 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)
-* Wed Sep 24 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.14-1
-- Make --size and --percent mutually exclusive in logvol (RHEL7). (dlehman)
+* Wed Sep 17 2014 Chris Lumens <clumens@redhat.com> - 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)
-- Add tests for --interfacename validation (mkolman)
-- Validate network interface name when parsing the kickstart (#1081982) (mkolman)
+- 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)
-* Thu Aug 28 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.13-1
-- Use the right bootloader command version for RHEL7 and F19. (clumens)
-- Do not set any magic default PE size in pykickstart (vpodzime)
-- Add an option to disable even installing the core group. (clumens)
-- Add a new bootloader --disabled option. (clumens)
-
-* Tue Aug 12 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.12-1
+* Tue Aug 12 2014 Chris Lumens <clumens@redhat.com> - 1.99.58-1
- Add --install flag to repo command (#1119867) (bcl)
-* Fri Aug 01 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.11-1
+* Wed Jul 02 2014 Chris Lumens <clumens@redhat.com> - 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 <clumens@redhat.com> - 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 <clumens@redhat.com> - 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 <clumens@redhat.com> - 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 <clumens@redhat.com> - 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 <clumens@redhat.com> - 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)
-* Wed Feb 26 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.10-1
+* Tue Mar 18 2014 Chris Lumens <clumens@redhat.com> - 1.99.51-1
+- Use the correct indentation for the new network stuff. (clumens)
- Add network --interfacename option for vlans (#1061646) (rvykydal)
-* Thu Feb 13 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.9-1
+* Mon Mar 17 2014 Chris Lumens <clumens@redhat.com> - 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)
-
-* Thu Feb 06 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.8-1
- Add support for fcoe --autovlan option (#1055779) (rvykydal)
-- Provide syntax for specifying environments (#1061296). (clumens)
-
-* Wed Jan 29 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.7-1
-- Include test cases in the source distribution. (clumens)
-- We need python-urlgrabber to do builds now. (clumens)
-* Wed Jan 29 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.6-1
-- Run "make test" as part of the RPM build process (#1025226). (clumens)
+* Wed Feb 05 2014 Chris Lumens <clumens@redhat.com> - 1.99.49-1
+- Provide syntax for specifying environments (#1061296). (clumens)
- Use the correct LogVolData object (#1058520). (clumens)
-
-* Mon Jan 27 2014 Chris Lumens <clumens@redhat.com> - 1.99.43.5-1
-- Check VNC password length (#1056939) (vpodzime)
- Don't do string comparisons in "make test" (#1057573). (clumens)
-* Wed Dec 18 2013 Chris Lumens <clumens@redhat.com> - 1.99.43.4-1
-- Add support for network team devices (#1003591) (rvykydal)
+* Mon Nov 25 2013 Chris Lumens <clumens@redhat.com> - 1.99.48-1
+- Specify a kickstart version when running package-related tests. (clumens)
+- We need python-urlgrabber to do builds now. (clumens)
-* Tue Dec 17 2013 Chris Lumens <clumens@redhat.com> - 1.99.43.3-1
-- method getattr should default to handler.url (#1029245) (bcl)
+* Mon Nov 25 2013 Chris Lumens <clumens@redhat.com> - 1.99.47-1
- Add missing version bumps for RHEL7 command control map (#1032738) (mkolman)
+- Run "make test" as part of the RPM build process (#1025226). (clumens)
+- Include test cases in the source distribution. (clumens)
+- With the previous patch, RAID test formatting needs to change. (clumens)
+- Do not add a list of PVs or RAID members when writing out --useexisting (#1021274). (clumens)
+- Raise an error if bootloader --boot-drive gets more than one argument. (clumens)
-* Mon Nov 11 2013 Chris Lumens <clumens@redhat.com> - 1.99.43.2-1
+* Thu Nov 14 2013 Chris Lumens <clumens@redhat.com> - 1.99.46-1
+- Add support for network team devices (#1003591) (rvykydal)
+- Work on test coverage a little bit. (clumens)
+- Don't use OrderedDict. (clumens)
- Add tests for tmpfs usage (mkolman)
- Add tmpfs support (#918621) (mkolman)
-* Sun Nov 03 2013 Chris Lumens <clumens@redhat.com> - 1.99.43.1-1
+* Fri Nov 01 2013 Chris Lumens <clumens@redhat.com> - 1.99.45-1
- Set bootloader location constructor default value to "none" (#916529) (amulhern)
+* Fri Oct 25 2013 Chris Lumens <clumens@redhat.com> - 1.99.44-1
+- method getattr should default to handler.url (bcl)
+ Related: rhbz#1016801
+
* Wed Oct 16 2013 Chris Lumens <clumens@redhat.com> - 1.99.43-1
- Use F20_Raid for RHEL7. (#997146) (dlehman)
@@ -139,9 +221,6 @@ make test
* Tue Sep 24 2013 Chris Lumens <clumens@redhat.com> - 1.99.40-1
- Don't error out if volgroup --useexisting is given with no members. (clumens)
-* Wed Sep 18 2013 Chris Lumens <clumens@redhat.com> - 1.99.35.4-1
-- Return None for attributes if no method has been set (#1002371) (dshea)
-
* Tue Sep 10 2013 Chris Lumens <clumens@redhat.com> - 1.99.39-1
- Call the right attribute method (#1004889) (bcl)
- Reset method seen attrs when switching method (#1004889) (bcl)
@@ -155,21 +234,12 @@ make test
- Fix up how we call pylint for 1.0.0. (clumens)
- Set method.method when attempted. (dshea)
-* Wed Aug 21 2013 Chris Lumens <clumens@redhat.com> - 1.99.35.3-1
-- Set method.method when attempted. (#999173) (dshea)
-
* Mon Aug 19 2013 Chris Lumens <clumens@redhat.com> - 1.99.36-1
- When method.method is set, also set the right seen attribute (#994553). (clumens)
- Add tests for incorrect command usage detection (mkolman)
- Add class for independent multi-line command sequence tests (mkolman)
- Raise an error if autopart is combined with partitioning commands (#886010) (mkolman)
-* Thu Aug 15 2013 Chris Lumens <clumens@redhat.com> - 1.99.35.2-1
-- Remove the BuildRequires on transifex-client. (clumens)
-
-* Thu Aug 15 2013 Chris Lumens <clumens@redhat.com> - 1.99.35.1-1
-- When method.method is set, also set the right seen attribute (#994553). (clumens)
-
* Mon Jul 29 2013 Chris Lumens <clumens@redhat.com> - 1.99.35-1
- Add aliases for all the old method classes (#986069). (clumens)
- Check syntax version before issuing a deprecation warning (#972098). (clumens)
@@ -948,7 +1018,7 @@ make test
- Support --mtu for the network command (#191328).
- Accept --isUtc for backwards compatibility.
-* Wed May 04 2006 Chris Lumens <clumens@redhat.com> 0.27-1
+* Thu May 04 2006 Chris Lumens <clumens@redhat.com> 0.27-1
- Output formatting fixes.
- Added commands for managing users and services.