diff -ruN anaconda-13.21.215.p18/textw/upgrade_text.py anaconda-13.21.215.p19/textw/upgrade_text.py --- anaconda-13.21.215.p18/textw/upgrade_text.py 2014-03-29 21:20:52.000000000 -0700 +++ anaconda-13.21.215.p19/textw/upgrade_text.py 2014-03-29 21:22:36.000000000 -0700 @@ -222,10 +222,10 @@ parts = anaconda.id.rootParts cur_arch = os.uname()[4] - if cur_arch == 'i686': - cur_arch = '32' - else: - cur_arch = '64' + if cur_arch == 'i686': + cur_arch = '32' + else: + cur_arch = '64' height = min(len(parts), 11) + 1 if height == 12: @@ -237,33 +237,31 @@ default = 1 - sys_is_not_upgradeable = 0 - - upgradeable_partitions = len(parts) - if upgradeable_partitions != 1: - sys_is_not_upgradeable = 1 - header = _("System has problem") - reason = _("Your system is not upgradeable. There is more than one SME server partition.") + sys_is_not_upgradeable = 0 + + upgradeable_partitions = len(parts) + if upgradeable_partitions != 1: + sys_is_not_upgradeable = 1 + header = _("System has problem") + reason = _("Your system is not upgradeable. There is more than one SME server partition.") (drive, desc, arch) = parts[0] - #for (device, desc) in parts: - # partList.append("%s (%s)" %(desc, device.path)) - if arch != cur_arch: - sys_is_not_upgradeable = 1 - header = _("Wrong SME server version") - reason = _("Your system is not upgradeable using this version of SME server. The currently installed system is a %s bit version, but this version of SME server is a %s bit version.") % (arch, cur_arch) - - if sys_is_not_upgradeable: - partList.append(_("Reboot system")) - (button, choice) = ListboxChoiceWindow(screen, header, - reason, partList, - [ TEXT_OK_BUTTON, - TEXT_BACK_BUTTON ], - width = 55, scroll = scroll, - height = height, - help = "upgraderoot", - default = 1) + if arch != cur_arch: + sys_is_not_upgradeable = 1 + header = _("Wrong SME server version") + reason = _("Your system is not upgradeable using this version of SME server. The currently installed system is a %s bit version, but this version of SME server is a %s bit version.") % (arch, cur_arch) + + if sys_is_not_upgradeable: + partList.append(_("Reboot system")) + (button, choice) = ListboxChoiceWindow(screen, header, + reason, partList, + [ TEXT_OK_BUTTON, + TEXT_BACK_BUTTON ], + width = 55, scroll = scroll, + height = height, + help = "upgraderoot", + default = 1) if button == TEXT_BACK_CHECK: return INSTALL_BACK