diff options
| author | Radek Vykydal <rvykydal@redhat.com> | 2009-08-05 16:39:26 +0200 |
|---|---|---|
| committer | Radek Vykydal <rvykydal@redhat.com> | 2009-08-05 16:51:37 +0200 |
| commit | d09f40b03a1da5ab530c4857d9cb21545e155852 (patch) | |
| tree | 09016c0d8a426d5444fbb27025572356843f856e /upgrade.py | |
| parent | 18d4d9d681fe4edb59c37bb8c65d78f5e1b4b4c7 (diff) | |
| download | anaconda-d09f40b03a1da5ab530c4857d9cb21545e155852.tar.gz anaconda-d09f40b03a1da5ab530c4857d9cb21545e155852.tar.xz anaconda-d09f40b03a1da5ab530c4857d9cb21545e155852.zip | |
Do not offer going back when ugrade root for ks upgrade is not found (#499321)
Going back results in traceback which seems not right. Bug 499321 (preupgrade
backtrace) has lots of tracebacks with various causes of upgrade root not found
- I distincted two groups.: 1) dmraid not detected in f10 (=> installation on
2 disks) while detected in f11 (=> root not found). 2) root considered as
non-upgradable (/etc/redhat-release changed by user). Such a broad bug is
rather difficult to handle. OTOH we wouldn't get the tracebacks so easy if we
just ended with error message (as with the patch).
Diffstat (limited to 'upgrade.py')
| -rw-r--r-- | upgrade.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/upgrade.py b/upgrade.py index c94cc3ae4..48edff01b 100644 --- a/upgrade.py +++ b/upgrade.py @@ -188,18 +188,26 @@ def upgradeMountFilesystems(anaconda): except IndexError as e: # The upgrade root is search earlier but we give the message here. log.debug("No upgrade root was found.") - rc = anaconda.intf.messageWindow(_("Upgrade root not found"), + if anaconda.isKickstart and anaconda.id.ksdata.upgrade.upgrade: + anaconda.intf.messageWindow(_("Upgrade root not found"), _("The root for the previously installed system was not " - "found. You can exit installer or backtrack to choose " - "installation instead of upgrade."), - type="custom", - custom_buttons = [ _("_Back"), - _("_Exit installer") ], - custom_icon="question") - if rc == 0: - return DISPATCH_BACK - elif rc == 1: + "found."), type="custom", + custom_icon="info", + custom_buttons=[_("Exit installer")]) sys.exit(0) + else: + rc = anaconda.intf.messageWindow(_("Upgrade root not found"), + _("The root for the previously installed system was not " + "found. You can exit installer or backtrack to choose " + "installation instead of upgrade."), + type="custom", + custom_buttons = [ _("_Back"), + _("_Exit installer") ], + custom_icon="question") + if rc == 0: + return DISPATCH_BACK + elif rc == 1: + sys.exit(0) checkLinks = ( '/etc', '/var', '/var/lib', '/var/lib/rpm', '/boot', '/tmp', '/var/tmp', '/root', |