diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-02-25 21:12:25 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-02-25 21:12:25 +0000 |
| commit | 3fd46cb82cf6fca693492be6e469f0744c2e7b83 (patch) | |
| tree | b35281fed22e7a44b068431175c0f1867cf6c1c5 /textw | |
| parent | 7e3a202f5594a775116cb0f70a7733f227ac93ae (diff) | |
| download | anaconda-3fd46cb82cf6fca693492be6e469f0744c2e7b83.tar.gz anaconda-3fd46cb82cf6fca693492be6e469f0744c2e7b83.tar.xz anaconda-3fd46cb82cf6fca693492be6e469f0744c2e7b83.zip | |
merge from branch to HEAD. turkish stays on HEAD, though
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/upgrade_bootloader_text.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/textw/upgrade_bootloader_text.py b/textw/upgrade_bootloader_text.py index edf9d3682..fa91e086a 100644 --- a/textw/upgrade_bootloader_text.py +++ b/textw/upgrade_bootloader_text.py @@ -39,12 +39,12 @@ class UpgradeBootloaderWindow: elif dispatch.stepInSkipList("instbootloader"): nobl = 1 else: - if self.type != None and self.bootDev != None: + if self.type is not None and self.bootDev is not None: update = 1 else: nobl = 0 - if self.type != None and self.bootDev != None: + if self.type is not None and self.bootDev is not None: t = TextboxReflowed(53, _("The installer has detected the %s boot " "loader currently installed on %s.") @@ -93,7 +93,7 @@ class UpgradeBootloaderWindow: self.dispatch.skipStep("bootloader", skip = 1) self.dispatch.skipStep("bootloaderadvanced", skip = 1) self.dispatch.skipStep("instbootloader", skip = 1) - if blradio.getSelection() == "newbl": + elif blradio.getSelection() == "newbl": self.dispatch.skipStep("bootloadersetup", skip = 0) self.dispatch.skipStep("bootloader", skip = 0) self.dispatch.skipStep("bootloaderadvanced", skip = 0) |