50 |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/instdata.py mezzanine_patched_anaconda-10.1.1.37/instdata.py |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/instdata.py mezzanine_patched_anaconda-10.1.1.37/instdata.py |
51 |
--- anaconda-10.1.1.37/instdata.py 2004-08-25 23:12:10.000000000 +1000 |
--- anaconda-10.1.1.37/instdata.py 2004-08-25 23:12:10.000000000 +1000 |
52 |
+++ mezzanine_patched_anaconda-10.1.1.37/instdata.py 2006-04-06 06:44:44.401953223 +1000 |
+++ mezzanine_patched_anaconda-10.1.1.37/instdata.py 2006-04-06 06:44:44.401953223 +1000 |
53 |
@@ -114,10 +114,7 @@ |
@@ -116,10 +116,7 @@ |
54 |
|
|
55 |
def write(self, instPath): |
def write(self, instPath): |
56 |
self.langSupport.write (instPath) |
self.langSupport.write (instPath) |
62 |
self.timezone.write (instPath) |
self.timezone.write (instPath) |
63 |
self.auth.write (instPath) |
self.auth.write (instPath) |
64 |
self.firewall.write (instPath) |
self.firewall.write (instPath) |
65 |
@@ -170,8 +167,8 @@ |
@@ -172,8 +169,8 @@ |
66 |
|
|
67 |
self.instLanguage.writeKS(f) |
self.instLanguage.writeKS(f) |
68 |
self.langSupport.writeKS(f) |
self.langSupport.writeKS(f) |
93 |
log("Running kickstart %%post script(s)") |
log("Running kickstart %%post script(s)") |
94 |
for script in self.postScripts: |
for script in self.postScripts: |
95 |
script.run(rootPath, serial) |
script.run(rootPath, serial) |
96 |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/lang-table mezzanine_patched_anaconda-10.1.1.37/lang-table |
--- anaconda-10.1.1.81/lang-table.sme 2004-10-25 06:38:22.000000000 -0600 |
97 |
--- anaconda-10.1.1.37/lang-table 2004-10-25 22:38:22.000000000 +1000 |
+++ anaconda-10.1.1.81/lang-table 2008-03-07 13:34:48.000000000 -0700 |
98 |
+++ mezzanine_patched_anaconda-10.1.1.37/lang-table 2006-04-06 06:46:15.455133408 +1000 |
@@ -1,41 +1,14 @@ |
|
@@ -1,41 +1,5 @@ |
|
99 |
-Arabic ar none ar_SA.UTF-8 us Asia/Riyadh ar_SA.UTF-8 |
-Arabic ar none ar_SA.UTF-8 us Asia/Riyadh ar_SA.UTF-8 |
100 |
-Bengali bn none bn_BD.UTF-8 us Asia/Dhaka bn_BD.UTF-8 |
-Bengali bn none bn_BD.UTF-8 us Asia/Dhaka bn_BD.UTF-8 |
101 |
-Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta bn_IN.UTF-8 |
-Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta bn_IN.UTF-8 |
102 |
-Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia bg_BG.UTF-8 |
Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia bg_BG.UTF-8 |
103 |
-Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 |
-Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 |
104 |
-Chinese(Simplified) zh_CN bterm zh_CN.UTF-8 us Asia/Shanghai zh_CN.UTF-8 |
-Chinese(Simplified) zh_CN bterm zh_CN.UTF-8 us Asia/Shanghai zh_CN.UTF-8 |
105 |
-Chinese(Traditional) zh_TW bterm zh_TW.UTF-8 us Asia/Taipei zh_TW.UTF-8 |
-Chinese(Traditional) zh_TW bterm zh_TW.UTF-8 us Asia/Taipei zh_TW.UTF-8 |
106 |
-Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb hr_HR.UTF-8 |
-Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb hr_HR.UTF-8 |
107 |
-Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague cs_CZ.UTF-8 |
-Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague cs_CZ.UTF-8 |
108 |
-Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen da_DK.UTF-8 |
Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen da_DK.UTF-8 |
109 |
-Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam nl_NL.UTF-8 |
Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam nl_NL.UTF-8 |
|
+Deutsch de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 |
|
110 |
English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York en_US.UTF-8 |
English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York en_US.UTF-8 |
111 |
-Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn et_EE.UTF-8 |
-Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn et_EE.UTF-8 |
112 |
-Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki fi_FI.UTF-8 |
-Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki fi_FI.UTF-8 |
113 |
-French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 |
French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 |
114 |
-German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 |
German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 |
115 |
-Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta gu_IN.UTF-8 |
-Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta gu_IN.UTF-8 |
116 |
-Hindi hi none hi_IN.UTF-8 us Asia/Calcutta hi_IN.UTF-8 |
-Hindi hi none hi_IN.UTF-8 us Asia/Calcutta hi_IN.UTF-8 |
117 |
-Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest hu_HU.UTF-8 |
Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest hu_HU.UTF-8 |
118 |
-Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik is_IS.UTF-8 |
-Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik is_IS.UTF-8 |
119 |
-Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 |
Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 |
120 |
-Japanese ja bterm ja_JP.UTF-8 jp106 Asia/Tokyo ja_JP.UTF-8 |
-Japanese ja bterm ja_JP.UTF-8 jp106 Asia/Tokyo ja_JP.UTF-8 |
121 |
-Korean ko bterm ko_KR.UTF-8 us Asia/Seoul ko_KR.UTF-8 |
-Korean ko bterm ko_KR.UTF-8 us Asia/Seoul ko_KR.UTF-8 |
122 |
-Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje mk_MK.UTF-8 |
-Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje mk_MK.UTF-8 |
124 |
-Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo nb_NO.UTF-8 |
-Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo nb_NO.UTF-8 |
125 |
-Persian fa none fa_IR.UTF-8 us Asia/Tehran fa_IR.UTF-8 |
-Persian fa none fa_IR.UTF-8 us Asia/Tehran fa_IR.UTF-8 |
126 |
-Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl Europe/Warsaw pl_PL.UTF-8 |
-Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl Europe/Warsaw pl_PL.UTF-8 |
127 |
-Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon pt_PT.UTF-8 |
Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon pt_PT.UTF-8 |
128 |
-Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo pt_BR.UTF-8 |
Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo pt_BR.UTF-8 |
129 |
-Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta pa_IN.UTF-8 |
-Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta pa_IN.UTF-8 |
130 |
-Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow ru_RU.UTF-8 |
-Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow ru_RU.UTF-8 |
131 |
-Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana sl_SI.UTF-8 |
Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana sl_SI.UTF-8 |
132 |
-Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 |
Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 |
133 |
-Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm sv_SE.UTF-8 |
Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm sv_SE.UTF-8 |
134 |
-Tamil ta none ta_IN.UTF-8 us Asia/Calcutta ta_IN.UTF-8 |
-Tamil ta none ta_IN.UTF-8 us Asia/Calcutta ta_IN.UTF-8 |
135 |
-Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul tr_TR.UTF-8 |
Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul tr_TR.UTF-8 |
136 |
-Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev uk_UA.UTF-8 |
-Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev uk_UA.UTF-8 |
137 |
-Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon vi_VN.UTF-8 |
-Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon vi_VN.UTF-8 |
138 |
-Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London cy_GB.UTF-8 |
-Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London cy_GB.UTF-8 |
139 |
-Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg zu_ZA.UTF-8 |
-Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg zu_ZA.UTF-8 |
140 |
+Español es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 |
--- anaconda-10.1.1.81/packages.py.sme 2008-03-17 11:02:31.000000000 -0600 |
141 |
+Français fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 |
+++ anaconda-10.1.1.81/packages.py 2008-03-17 11:07:55.000000000 -0600 |
142 |
+Italiano it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 |
@@ -1610,7 +1610,7 @@ |
143 |
|
"from testers, and it is not suitable " |
144 |
|
"for day to day usage.\n\n" |
145 |
|
"To report feedback, please visit:\n\n" |
146 |
|
- " http://www.centos.orrg/bugs\n\n" |
147 |
|
+ " http://bugs.contribs.org/\n\n" |
148 |
|
"and file a report against '%s'.\n" |
149 |
|
%(productName, fileagainst)), |
150 |
|
type="custom", custom_icon="warning", |
151 |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/partedUtils.py mezzanine_patched_anaconda-10.1.1.37/partedUtils.py |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/partedUtils.py mezzanine_patched_anaconda-10.1.1.37/partedUtils.py |
152 |
--- anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:59:28.175482025 +1000 |
--- anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:59:28.175482025 +1000 |
153 |
+++ mezzanine_patched_anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:47:31.309955789 +1000 |
+++ mezzanine_patched_anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:47:31.309955789 +1000 |
364 |
- else: |
- else: |
365 |
- devname = drive |
- devname = drive |
366 |
- partList.append("%s (%s)" %(desc, drive)) |
- partList.append("%s (%s)" %(desc, drive)) |
367 |
+ partList.append("Upgrade existing \"%s\" system" %(desc)) |
+ partList.append(_("Upgrade existing \"%s\" system") %(desc)) |
368 |
|
|
369 |
(button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), |
(button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), |
370 |
- _("One or more existing Linux installations " |
- _("One or more existing Linux installations " |
386 |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/upgrade.py mezzanine_patched_anaconda-10.1.1.37/upgrade.py |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/upgrade.py mezzanine_patched_anaconda-10.1.1.37/upgrade.py |
387 |
--- anaconda-10.1.1.37/upgrade.py 2006-04-06 06:59:28.387445237 +1000 |
--- anaconda-10.1.1.37/upgrade.py 2006-04-06 06:59:28.387445237 +1000 |
388 |
+++ mezzanine_patched_anaconda-10.1.1.37/upgrade.py 2006-04-06 06:50:27.473356801 +1000 |
+++ mezzanine_patched_anaconda-10.1.1.37/upgrade.py 2006-04-06 06:50:27.473356801 +1000 |
389 |
@@ -38,6 +38,21 @@ |
@@ -49,6 +49,21 @@ |
390 |
upgrade_remove_blacklist = () |
upgrade_remove_blacklist = ( ("samba","ppc64"),) |
391 |
|
|
392 |
def findRootParts(intf, id, dispatch, dir, chroot): |
def findRootParts(intf, id, dispatch, dir, chroot): |
393 |
+# w = intf.waitWindow(_("Converting to RAID"), |
+# w = intf.waitWindow(_("Converting to RAID"), |
394 |
+# _("Converting to RAID, this may take several minutes...")) |
+# _("Converting to RAID, this may take several minutes...")) |
408 |
if dir == DISPATCH_BACK: |
if dir == DISPATCH_BACK: |
409 |
return |
return |
410 |
if id.rootParts is None: |
if id.rootParts is None: |
411 |
@@ -49,7 +64,7 @@ |
@@ -60,7 +75,7 @@ |
412 |
|
|
413 |
if id.rootParts is not None and len(id.rootParts) > 0: |
if id.rootParts is not None and len(id.rootParts) > 0: |
414 |
dispatch.skipStep("findinstall", skip = 0) |
dispatch.skipStep("findinstall", skip = 0) |
417 |
dispatch.skipStep("installtype", skip = 1) |
dispatch.skipStep("installtype", skip = 1) |
418 |
else: |
else: |
419 |
dispatch.skipStep("findinstall", skip = 1) |
dispatch.skipStep("findinstall", skip = 1) |
420 |
@@ -501,10 +516,10 @@ |
@@ -513,10 +528,10 @@ |
421 |
pass |
pass |
422 |
sys.exit(0) |
sys.exit(0) |
423 |
|
|
430 |
"that this is not a %s system. " |
"that this is not a %s system. " |
431 |
"Continuing with the upgrade process may " |
"Continuing with the upgrade process may " |
432 |
"leave the system in an unusable state. Do " |
"leave the system in an unusable state. Do " |
433 |
@@ -521,7 +536,7 @@ |
@@ -533,7 +548,7 @@ |
434 |
# Figure out current version for upgrade nag and for determining weird |
# Figure out current version for upgrade nag and for determining weird |
435 |
# upgrade cases |
# upgrade cases |
436 |
supportedUpgradeVersion = -1 |
supportedUpgradeVersion = -1 |
439 |
for h in mi: |
for h in mi: |
440 |
if h[rpm.RPMTAG_EPOCH] is None: |
if h[rpm.RPMTAG_EPOCH] is None: |
441 |
epoch = None |
epoch = None |
442 |
@@ -529,7 +544,7 @@ |
@@ -541,7 +556,7 @@ |
443 |
epoch = str(h[rpm.RPMTAG_EPOCH]) |
epoch = str(h[rpm.RPMTAG_EPOCH]) |
444 |
|
|
445 |
if supportedUpgradeVersion <= 0: |
if supportedUpgradeVersion <= 0: |
448 |
(epoch, h[rpm.RPMTAG_VERSION], |
(epoch, h[rpm.RPMTAG_VERSION], |
449 |
h[rpm.RPMTAG_RELEASE])) |
h[rpm.RPMTAG_RELEASE])) |
450 |
if val > 0: |
if val > 0: |
451 |
@@ -538,9 +553,6 @@ |
@@ -550,9 +565,6 @@ |
452 |
supportedUpgradeVersion = 1 |
supportedUpgradeVersion = 1 |
453 |
break |
break |
454 |
|
|