| 1 |
wellsi |
1.2 |
diff -ruN anaconda-13.21.215.p18/textw/upgrade_text.py anaconda-13.21.215.p19/textw/upgrade_text.py |
| 2 |
|
|
--- anaconda-13.21.215.p18/textw/upgrade_text.py 2014-03-29 21:20:52.000000000 -0700 |
| 3 |
|
|
+++ anaconda-13.21.215.p19/textw/upgrade_text.py 2014-03-29 21:22:36.000000000 -0700 |
| 4 |
wellsi |
1.1 |
@@ -222,10 +222,10 @@ |
| 5 |
|
|
|
| 6 |
|
|
parts = anaconda.id.rootParts |
| 7 |
|
|
cur_arch = os.uname()[4] |
| 8 |
wellsi |
1.2 |
- if cur_arch == 'i686': |
| 9 |
|
|
- cur_arch = '32' |
| 10 |
|
|
- else: |
| 11 |
|
|
- cur_arch = '64' |
| 12 |
|
|
+ if cur_arch == 'i686': |
| 13 |
|
|
+ cur_arch = '32' |
| 14 |
|
|
+ else: |
| 15 |
|
|
+ cur_arch = '64' |
| 16 |
wellsi |
1.1 |
|
| 17 |
|
|
height = min(len(parts), 11) + 1 |
| 18 |
|
|
if height == 12: |
| 19 |
wellsi |
1.2 |
@@ -237,33 +237,31 @@ |
| 20 |
wellsi |
1.1 |
|
| 21 |
|
|
default = 1 |
| 22 |
|
|
|
| 23 |
wellsi |
1.2 |
- sys_is_not_upgradeable = 0 |
| 24 |
|
|
- |
| 25 |
|
|
- upgradeable_partitions = len(parts) |
| 26 |
|
|
- if upgradeable_partitions != 1: |
| 27 |
|
|
- sys_is_not_upgradeable = 1 |
| 28 |
|
|
- header = _("System has problem") |
| 29 |
|
|
- reason = _("Your system is not upgradeable. There is more than one SME server partition.") |
| 30 |
|
|
+ sys_is_not_upgradeable = 0 |
| 31 |
|
|
+ |
| 32 |
|
|
+ upgradeable_partitions = len(parts) |
| 33 |
|
|
+ if upgradeable_partitions != 1: |
| 34 |
|
|
+ sys_is_not_upgradeable = 1 |
| 35 |
|
|
+ header = _("System has problem") |
| 36 |
|
|
+ reason = _("Your system is not upgradeable. There is more than one SME server partition.") |
| 37 |
wellsi |
1.1 |
|
| 38 |
|
|
(drive, desc, arch) = parts[0] |
| 39 |
wellsi |
1.2 |
- #for (device, desc) in parts: |
| 40 |
|
|
- # partList.append("%s (%s)" %(desc, device.path)) |
| 41 |
wellsi |
1.1 |
|
| 42 |
wellsi |
1.2 |
- if arch != cur_arch: |
| 43 |
|
|
- sys_is_not_upgradeable = 1 |
| 44 |
|
|
- header = _("Wrong SME server version") |
| 45 |
|
|
- 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) |
| 46 |
wellsi |
1.1 |
- |
| 47 |
wellsi |
1.2 |
- if sys_is_not_upgradeable: |
| 48 |
|
|
- partList.append(_("Reboot system")) |
| 49 |
|
|
- (button, choice) = ListboxChoiceWindow(screen, header, |
| 50 |
|
|
- reason, partList, |
| 51 |
|
|
- [ TEXT_OK_BUTTON, |
| 52 |
|
|
- TEXT_BACK_BUTTON ], |
| 53 |
|
|
- width = 55, scroll = scroll, |
| 54 |
|
|
- height = height, |
| 55 |
|
|
- help = "upgraderoot", |
| 56 |
|
|
- default = 1) |
| 57 |
|
|
+ if arch != cur_arch: |
| 58 |
|
|
+ sys_is_not_upgradeable = 1 |
| 59 |
|
|
+ header = _("Wrong SME server version") |
| 60 |
|
|
+ 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) |
| 61 |
wellsi |
1.1 |
+ |
| 62 |
wellsi |
1.2 |
+ if sys_is_not_upgradeable: |
| 63 |
|
|
+ partList.append(_("Reboot system")) |
| 64 |
|
|
+ (button, choice) = ListboxChoiceWindow(screen, header, |
| 65 |
|
|
+ reason, partList, |
| 66 |
|
|
+ [ TEXT_OK_BUTTON, |
| 67 |
|
|
+ TEXT_BACK_BUTTON ], |
| 68 |
|
|
+ width = 55, scroll = scroll, |
| 69 |
|
|
+ height = height, |
| 70 |
|
|
+ help = "upgraderoot", |
| 71 |
|
|
+ default = 1) |
| 72 |
wellsi |
1.1 |
|
| 73 |
|
|
if button == TEXT_BACK_CHECK: |
| 74 |
|
|
return INSTALL_BACK |
Parent Directory
| 
Revision Log
| 
Revision Graph
