summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-05-03 18:04:43 +0000
committerChris Lumens <clumens@redhat.com>2006-05-03 18:04:43 +0000
commit158d06751d60ff7955ac1b68a0430849668472ea (patch)
treebc93c459ca5e7152cf0298462a8b1d4accbd3d57
parent422211b0bac84edd23bdff5e79a8011937372d00 (diff)
downloadanaconda-158d06751d60ff7955ac1b68a0430849668472ea.tar.gz
anaconda-158d06751d60ff7955ac1b68a0430849668472ea.tar.xz
anaconda-158d06751d60ff7955ac1b68a0430849668472ea.zip
Don't traceback if pykickstart gets support for a new command before anaconda.
-rw-r--r--ChangeLog5
-rw-r--r--kickstart.py8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f8dc8183..cca9a6bbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,11 +3,14 @@
* backend.py (AnacondaBackend.doPostInstall): Enable/disable services
and create users after installation.
* instdata.py: Remove password-related code.
- * kickcstart.py (AnacondaKSHandlers.doServices,
+ * kickstart.py (AnacondaKSHandlers.doServices,
AnacondaKSHandlers.doUser): Add new command handlers.
* users.py: Added back in code to create users, since kickstart can
do this now.
+ * kickstart.py (AnacondaKSParser.handleCommand): Don't traceback if
+ pykickstart gets support for a new command before anaconda.
+
2006-05-03 Jeremy Katz <katzj@redhat.com>
* isys/isys.c: Don't include kernel fs headers -- the e2fsprogs
diff --git a/kickstart.py b/kickstart.py
index f0a48020d..f1fee655a 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -706,7 +706,13 @@ class AnacondaKSParser(KickstartParser):
if self.handler.handlers[cmd] != None:
self.handler.currentCmd = cmd
self.handler.lineno = lineno
- self.handler.handlers[cmd](self.id, cmdArgs)
+
+ # Don't crash if pykickstart gets rebuilt with a new command
+ # before anaconda also supports it.
+ try:
+ self.handler.handlers[cmd](self.id, cmdArgs)
+ except TypeError:
+ log.warning("anaconda does not yet support the %s kickstart command, ignoring for now" % cmd)
# The anaconda kickstart processor.
class Kickstart(BaseInstallClass):