diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-03-21 00:09:53 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-03-21 00:09:53 +0000 |
| commit | c29f0955045cdd02965a14300ce5e99364db2d1b (patch) | |
| tree | d84a948b5288d9b0b9bd28649f608b8df9f18ea0 /instdata.py | |
| parent | 720f69db5a6df4a3d6afe90ea228b5a90fe41333 (diff) | |
| download | anaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.tar.gz anaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.tar.xz anaconda-c29f0955045cdd02965a14300ce5e99364db2d1b.zip | |
merge taroon branch up until now. tagged as before-taroon-merge before and
will be tagged after-taroon-merge after. taroon at this point is tagged
taroon-merge-point for where to base merges from in the future
Diffstat (limited to 'instdata.py')
| -rw-r--r-- | instdata.py | 12 |
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) |