summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-03-19 00:18:24 +0000
committerJeremy Katz <katzj@redhat.com>2003-03-19 00:18:24 +0000
commit25edcc7093fd9e840b9353c0784b3b027213386e (patch)
tree967e159a30635aecaef56ff8b66460b969b48ad3
parentacfe5ccbe2d14edf4eb44836da7f593be7d1b40c (diff)
downloadanaconda-25edcc7093fd9e840b9353c0784b3b027213386e.tar.gz
anaconda-25edcc7093fd9e840b9353c0784b3b027213386e.tar.xz
anaconda-25edcc7093fd9e840b9353c0784b3b027213386e.zip
mouse and hw state aren't guaranteed to be more than None anymore (eg s390 :)
-rw-r--r--instdata.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/instdata.py b/instdata.py
index 53d224e61..ce9523905 100644
--- a/instdata.py
+++ b/instdata.py
@@ -103,8 +103,10 @@ class InstallData:
self.xsetup = xsetup
def write(self, instPath):
- self.langSupport.write (instPath)
- self.mouse.write(instPath)
+ self.langSupport.write (instPath)
+ if self.mouse is not None:
+ self.mouse.write(instPath)
+
self.keyboard.write (instPath)
self.network.write (instPath)
self.timezone.write (instPath)
@@ -126,8 +128,10 @@ class InstallData:
self.instLanguage.writeKS(f)
self.langSupport.writeKS(f)
self.keyboard.writeKS(f)
- self.mouse.writeKS(f)
- self.xsetup.writeKS(f, self.desktop)
+ if self.mouse is not None:
+ self.mouse.writeKS(f)
+ if self.xsetup is not None:
+ self.xsetup.writeKS(f, self.desktop)
self.network.writeKS(f)
self.rootPassword.writeKS(f, self.auth)
self.firewall.writeKS(f)