47 |
|
|
48 |
return INSTALL_OK |
return INSTALL_OK |
49 |
|
|
50 |
--- anaconda-11.1.2.87/textw/upgrade_bootloader_text.py.smeserver 2006-05-04 13:58:53.000000000 -0600 |
--- anaconda-11.1.2.87/textw/upgrade_bootloader_text.py.sme 2006-05-04 13:58:53.000000000 -0600 |
51 |
+++ anaconda-11.1.2.87/textw/upgrade_bootloader_text.py 2007-12-20 14:23:49.000000000 -0700 |
+++ anaconda-11.1.2.87/textw/upgrade_bootloader_text.py 2008-03-31 13:13:42.000000000 -0600 |
52 |
@@ -31,88 +31,11 @@ |
@@ -44,75 +44,24 @@ |
53 |
(self.type, self.bootDev) = \ |
else: |
54 |
checkbootloader.getBootloaderTypeAndBoot(anaconda.rootPath) |
nobl = 1 |
55 |
|
|
|
- blradio = RadioGroup() |
|
|
- |
|
|
- (update, newbl, nobl) = (0, 0, 0) |
|
|
- if not self.dispatch.stepInSkipList("bootloader"): |
|
|
- newbl = 1 |
|
|
- elif self.dispatch.stepInSkipList("instbootloader"): |
|
|
- nobl = 1 |
|
|
- else: |
|
|
- if self.type is not None and self.bootDev is not None: |
|
|
- update = 1 |
|
|
- else: |
|
|
- nobl = 1 |
|
|
- |
|
56 |
- if self.type is not None and self.bootDev is not None: |
- if self.type is not None and self.bootDev is not None: |
57 |
- t = TextboxReflowed(53, |
- t = TextboxReflowed(53, |
58 |
- _("The installer has detected the %s boot " |
- _("The installer has detected the %s boot " |
61 |
- |
- |
62 |
- self.update_radio = blradio.add(_("Update boot loader configuration"), |
- self.update_radio = blradio.add(_("Update boot loader configuration"), |
63 |
- "update", update) |
- "update", update) |
64 |
- else: |
+ if nobl == 1: |
65 |
|
+ self.dispatch.skipStep("bootloadersetup", skip = 1) |
66 |
|
+ self.dispatch.skipStep("bootloader", skip = 1) |
67 |
|
+ self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
68 |
|
+ self.dispatch.skipStep("instbootloader", skip = 1) |
69 |
|
+ elif newbl == 1: |
70 |
|
+ self.dispatch.skipStep("bootloadersetup", skip = 0) |
71 |
|
+ self.dispatch.skipStep("bootloader", skip = 1) |
72 |
|
+ self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
73 |
|
+ self.dispatch.skipStep("instbootloader", skip = 0) |
74 |
|
+ self.bl.doUpgradeOnly = 0 |
75 |
|
else: |
76 |
- t = TextboxReflowed(53, |
- t = TextboxReflowed(53, |
77 |
- _("The installer is unable to detect the boot loader " |
- _("The installer is unable to detect the boot loader " |
78 |
- "currently in use on your system.")) |
- "currently in use on your system.")) |
133 |
- self.bl.setDevice(self.bootDev) |
- self.bl.setDevice(self.bootDev) |
134 |
- |
- |
135 |
- |
- |
136 |
- |
+ self.dispatch.skipStep("bootloadersetup", skip = 0) |
137 |
|
+ self.dispatch.skipStep("bootloader", skip = 1) |
138 |
|
+ self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
139 |
|
+ self.dispatch.skipStep("instbootloader", skip = 0) |
140 |
|
+ self.bl.doUpgradeOnly = 1 |
141 |
|
+ self.bl.useGrubVal = 1 |
142 |
|
+ self.bl.setDevice(self.bootDev) |
143 |
|
|
144 |
- screen.popWindow() |
- screen.popWindow() |
145 |
- return INSTALL_OK |
- return INSTALL_OK |
|
+ self.dispatch.skipStep("bootloadersetup", skip = 0) |
|
|
+ self.dispatch.skipStep("bootloader", skip = 1) |
|
|
+ self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
|
|
+ self.dispatch.skipStep("instbootloader", skip = 0) |
|
|
+ self.bl.doUpgradeOnly = 1 |
|
|
+ self.bl.useGrubVal = 1 |
|
|
+ self.bl.setDevice(self.bootDev) |
|
146 |
+ return INSTALL_OK |
+ return INSTALL_OK |
147 |
--- anaconda-11.1.2.87/textw/upgrade_text.py.smeserver 2007-01-22 16:14:06.000000000 -0700 |
--- anaconda-11.1.2.87/textw/upgrade_text.py.smeserver 2007-01-22 16:14:06.000000000 -0700 |
148 |
+++ anaconda-11.1.2.87/textw/upgrade_text.py 2007-12-20 13:59:27.000000000 -0700 |
+++ anaconda-11.1.2.87/textw/upgrade_text.py 2007-12-20 13:59:27.000000000 -0700 |
386 |
postScripts = filter (lambda s: s.type == KS_SCRIPT_POST, |
postScripts = filter (lambda s: s.type == KS_SCRIPT_POST, |
387 |
self.ksdata.scripts) |
self.ksdata.scripts) |
388 |
|
|
389 |
--- anaconda-11.1.2.87/lang-table.sme 2006-12-04 13:31:57.000000000 -0700 |
--- anaconda-11.1.2.87/lang-table.smeserver 2006-12-04 13:31:57.000000000 -0700 |
390 |
+++ anaconda-11.1.2.87/lang-table 2008-03-18 09:38:10.000000000 -0600 |
+++ anaconda-11.1.2.87/lang-table 2008-03-18 09:38:10.000000000 -0600 |
391 |
@@ -1,54 +1,14 @@ |
@@ -1,54 +1,14 @@ |
392 |
-Afrikaans af latarcyrheb-sun16 af_ZA.UTF-8 us Africa/Johannesburg |
-Afrikaans af latarcyrheb-sun16 af_ZA.UTF-8 us Africa/Johannesburg |
443 |
-Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon |
-Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon |
444 |
-Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London |
-Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London |
445 |
-Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg |
-Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg |
446 |
--- anaconda-11.1.2.87/language.py.sme 2006-10-10 11:18:09.000000000 -0600 |
--- anaconda-11.1.2.87/language.py.smeserver 2006-10-10 11:18:09.000000000 -0600 |
447 |
+++ anaconda-11.1.2.87/language.py 2008-03-18 09:43:03.000000000 -0600 |
+++ anaconda-11.1.2.87/language.py 2008-03-18 09:43:03.000000000 -0600 |
448 |
@@ -57,7 +57,9 @@ |
@@ -57,7 +57,9 @@ |
449 |
self.current = "en_US.UTF-8" |
self.current = "en_US.UTF-8" |
451 |
# English name -> native name mapping |
# English name -> native name mapping |
452 |
- search = ('lang-names', '/usr/lib/anaconda/lang-names') |
- search = ('lang-names', '/usr/lib/anaconda/lang-names') |
453 |
+ search = ('lang-names', '/tmp/updates/lang-names', |
+ search = ('lang-names', '/tmp/updates/lang-names', |
454 |
+ '/mny/source/RHupdates/lang-names', |
+ '/mnt/source/RHupdates/lang-names', |
455 |
+ '/usr/lib/anaconda/lang-names') |
+ '/usr/lib/anaconda/lang-names') |
456 |
for path in search: |
for path in search: |
457 |
if os.access(path, os.R_OK): |
if os.access(path, os.R_OK): |
458 |
f = open(path, 'r') |
f = open(path, 'r') |
459 |
|
@@ -111,6 +111,8 @@ |
460 |
|
|
461 |
|
def getNickByName (self, name): |
462 |
|
for k in self.localeInfo.keys(): |
463 |
|
+ if k == 'C': |
464 |
|
+ continue |
465 |
|
row = self.localeInfo[k] |
466 |
|
if row[0] == name: |
467 |
|
return k |
468 |
--- anaconda-11.1.2.87/packages.py.smeserver 2007-12-20 13:41:11.000000000 -0700 |
--- anaconda-11.1.2.87/packages.py.smeserver 2007-12-20 13:41:11.000000000 -0700 |
469 |
+++ anaconda-11.1.2.87/packages.py 2007-12-20 13:40:41.000000000 -0700 |
+++ anaconda-11.1.2.87/packages.py 2007-12-20 13:40:41.000000000 -0700 |
470 |
@@ -146,6 +146,7 @@ |
@@ -146,6 +146,7 @@ |
544 |
else: |
else: |
545 |
anaconda.dispatch.gotoNext() |
anaconda.dispatch.gotoNext() |
546 |
|
|
547 |
--- anaconda-11.1.2.87/upgrade.py.sme 2007-01-22 16:14:06.000000000 -0700 |
--- anaconda-11.1.2.87/upgrade.py.smeserver 2007-01-22 16:14:06.000000000 -0700 |
548 |
+++ anaconda-11.1.2.87/upgrade.py 2008-03-18 09:10:12.000000000 -0600 |
+++ anaconda-11.1.2.87/upgrade.py 2008-03-18 09:10:12.000000000 -0600 |
549 |
@@ -113,7 +113,7 @@ |
@@ -113,7 +113,7 @@ |
550 |
|
|
555 |
anaconda.dispatch.skipStep("installtype", skip = 1) |
anaconda.dispatch.skipStep("installtype", skip = 1) |
556 |
else: |
else: |
557 |
anaconda.dispatch.skipStep("findinstall", skip = 1) |
anaconda.dispatch.skipStep("findinstall", skip = 1) |
558 |
--- anaconda-11.1.2.87/yuminstall.py.sme 2007-09-11 11:51:21.000000000 -0600 |
--- anaconda-11.1.2.87/yuminstall.py.smeserver 2007-09-11 11:51:21.000000000 -0600 |
559 |
+++ anaconda-11.1.2.87/yuminstall.py 2008-03-17 08:01:27.000000000 -0600 |
+++ anaconda-11.1.2.87/yuminstall.py 2008-03-17 08:01:27.000000000 -0600 |
560 |
@@ -1083,7 +1083,8 @@ |
@@ -1083,7 +1083,8 @@ |
561 |
|
|
576 |
n, a, e, v, r = pkgtup |
n, a, e, v, r = pkgtup |
577 |
if supportedUpgradeVersion <= 0: |
if supportedUpgradeVersion <= 0: |
578 |
- val = rpmUtils.miscutils.compareEVR((None, '3', '1'), |
- val = rpmUtils.miscutils.compareEVR((None, '3', '1'), |
579 |
+ val = rpmUtils.miscutils.compareEVR(('26', '7.3', '1.el4.sme'), |
+ val = rpmUtils.miscutils.compareEVR(('26', '7.0', '01'), |
580 |
(e, v,r)) |
(e, v,r)) |
581 |
if val > 0: |
if val > 0: |
582 |
supportedUpgradeVersion = 0 |
supportedUpgradeVersion = 0 |