anaconda/sme9/0010-CheckArch.patch2

diff -ru anaconda-13.21.215/textw/upgrade_text.py anaconda-13.21.215.new/textw/upgrade_text.py
--- anaconda-13.21.215/textw/upgrade_text.py    2014-01-01 20:29:02.283571144 -0500
+++ anaconda-13.21.215.new/textw/upgrade_text.py        2014-01-01 20:27:59.035865533 -0500
@@ -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:
@@ -235,36 +235,24 @@
         partList = []
         partList.append(_("Reinstall System"))
 
-    if (anaconda.id.upgrade == None and anaconda.dispatch.stepInSkipList("installtype")) or anaconda.id.upgrade:
-            default = 1
-        else:
-            default = 0
-
-    sys_is_not_upgradeable = 0
+        default = 1
 
-    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 MSL partition. Contact Mitel support for recovery instructions.")
 
         (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 MSL version")
+           reason = _("Your system is not upgradeable using this version of MSL. The currently installed system is a %s bit version, but this version of MSL is a %s bit version.") % (arch, cur_arch)
 
             if button == TEXT_BACK_CHECK:
                 return INSTALL_BACK
@@ -277,9 +265,9 @@
                     sys.exit(1)
 
         partList.append(_("Upgrade existing \"%s\" system") %(desc))
-
+ 
         (button, choice) =  ListboxChoiceWindow(screen, _("System to Upgrade"),
-                            _("Your system is upgradeable."), partList,
+                             _("Your system is upgradeable."), partList,
                                                 [ TEXT_OK_BUTTON,
                                                   TEXT_BACK_BUTTON ],
                                                 width = 55, scroll = scroll,
@@ -303,6 +291,7 @@
             anaconda.id.rootParts = parts
             anaconda.dispatch.skipStep("installtype", skip = 1)
         else:
+            anaconda.id.setUpgrade(False)
             anaconda.dispatch.skipStep("installtype", skip = 0)
             anaconda.id.upgradeRoot = None
 
1	charliebrady	1.1	diff -ru anaconda-13.21.215/textw/upgrade_text.py anaconda-13.21.215.new/textw/upgrade_text.py
2			--- anaconda-13.21.215/textw/upgrade_text.py 2014-01-01 20:29:02.283571144 -0500
3			+++ anaconda-13.21.215.new/textw/upgrade_text.py 2014-01-01 20:27:59.035865533 -0500
4			@@ -222,10 +222,10 @@
5
6			parts = anaconda.id.rootParts
7			cur_arch = os.uname()[4]
8			- 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
17			height = min(len(parts), 11) + 1
18			if height == 12:
19			@@ -235,36 +235,24 @@
20			partList = []
21			partList.append(_("Reinstall System"))
22
23			- if (anaconda.id.upgrade == None and anaconda.dispatch.stepInSkipList("installtype")) or anaconda.id.upgrade:
24			- default = 1
25			- else:
26			- default = 0
27			-
28			- sys_is_not_upgradeable = 0
29			+ default = 1
30
31			- upgradeable_partitions = len(parts)
32			- if upgradeable_partitions != 1:
33			- sys_is_not_upgradeable = 1
34			- header = _("System has problem")
35			- reason = _("Your system is not upgradeable. There is more than one SME server partition.")
36			+ sys_is_not_upgradeable = 0
37			+
38			+ upgradeable_partitions = len(parts)
39			+ if upgradeable_partitions != 1:
40			+ sys_is_not_upgradeable = 1
41			+ header = _("System has problem")
42			+ reason = _("Your system is not upgradeable. There is more than one MSL partition. Contact Mitel support for recovery instructions.")
43
44			(drive, desc, arch) = parts[0]
45			+ #for (device, desc) in parts:
46			+ # partList.append("%s (%s)" %(desc, device.path))
47
48			- if arch != cur_arch:
49			- sys_is_not_upgradeable = 1
50			- header = _("Wrong SME server version")
51			- 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)
52			-
53			- if sys_is_not_upgradeable:
54			- partList.append(_("Reboot system"))
55			- (button, choice) = ListboxChoiceWindow(screen, header,
56			- reason, partList,
57			- [ TEXT_OK_BUTTON,
58			- TEXT_BACK_BUTTON ],
59			- width = 55, scroll = scroll,
60			- height = height,
61			- help = "upgraderoot",
62			- default = 1)
63			+ if arch != cur_arch:
64			+ sys_is_not_upgradeable = 1
65			+ header = _("Wrong MSL version")
66			+ reason = _("Your system is not upgradeable using this version of MSL. The currently installed system is a %s bit version, but this version of MSL is a %s bit version.") % (arch, cur_arch)
67
68			if button == TEXT_BACK_CHECK:
69			return INSTALL_BACK
70			@@ -277,9 +265,9 @@
71			sys.exit(1)
72
73			partList.append(_("Upgrade existing \"%s\" system") %(desc))
74			-
75			+
76			(button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"),
77			- _("Your system is upgradeable."), partList,
78			+ _("Your system is upgradeable."), partList,
79			[ TEXT_OK_BUTTON,
80			TEXT_BACK_BUTTON ],
81			width = 55, scroll = scroll,
82			@@ -303,6 +291,7 @@
83			anaconda.id.rootParts = parts
84			anaconda.dispatch.skipStep("installtype", skip = 1)
85			else:
86			+ anaconda.id.setUpgrade(False)
87			anaconda.dispatch.skipStep("installtype", skip = 0)
88			anaconda.id.upgradeRoot = None
89