From 5985f103fce55f86575fa8baae6ce4b78317f86a Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Tue, 24 Oct 2006 16:37:43 +0000
Subject: [PATCH] Add writer for --key (#211997).

---
 ChangeLog             | 4 ++++
 pykickstart.spec      | 5 ++++-
 pykickstart/writer.py | 9 ++++-----
 setup.py              | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5de640e..26bbd37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-24  Chris Lumens  <clumens@redhat.com>
+
+	* pykickstart.spec, setup.py:  Bump version.
+
 2006-10-17  Chris Lumens  <clumens@redhat.com>
 
 	* pykickstart/writer.py:  Add writer for key command.
diff --git a/pykickstart.spec b/pykickstart.spec
index e1f1546..5873679 100644
--- a/pykickstart.spec
+++ b/pykickstart.spec
@@ -2,7 +2,7 @@
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
-Version: 0.38
+Version: 0.39
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/locale/*/*/*
 
 %changelog
+* Tue Oct 24 2006 Chris Lumens <clumens@redhat.com> - 0.39-1
+- Add writer for --key (#211997).
+
 * Tue Oct 17 2006 Jeremy Katz <katzj@redhat.com> - 0.38-1
 - allow --skip for installation number as well (#207029)
 
diff --git a/pykickstart/writer.py b/pykickstart/writer.py
index aa0a2a8..b3e02c4 100644
--- a/pykickstart/writer.py
+++ b/pykickstart/writer.py
@@ -243,11 +243,10 @@ class KickstartWriter:
             return "iscsiname %s" % self.ksdata.iscsiname
 
     def doKey(self):
-        if self.ksdata.key != "":
-            if self.ksdata.key == KS_INSTKEY_SKIP:
-                return "key --skip"
-            else:
-                return "key %s" % self.ksdata.key
+        if self.ksdata.key == KS_INSTKEY_SKIP:
+            return "key --skip"
+        elif self.ksdata.key != "":
+            return "key %s" % self.ksdata.key
 
     def doKeyboard(self):
         if self.ksdata.keyboard != "":
diff --git a/setup.py b/setup.py
index 9379cee..7e45455 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 from distutils.core import setup
 
-setup(name='pykickstart', version='0.38',
+setup(name='pykickstart', version='0.39',
       description='Python module for manipulating kickstart files',
       author='Chris Lumens', author_email='clumens@redhat.com',
       url='http://fedoraproject.org/wiki/pykickstart',
-- 
2.11.4.GIT