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,11 @@ |
|
@@ -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 |
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 |
110 |
|
+Dansk da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen da_DK.UTF-8 |
111 |
+Deutsch de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 |
+Deutsch de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 |
112 |
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 |
113 |
-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 |
142 |
+Español es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 |
+Español es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 |
143 |
+Français fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 |
+Français fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 |
144 |
+Italiano it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 |
+Italiano it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 |
145 |
|
+Magyar hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest hu_HU.UTF-8 |
146 |
|
+Nederlands nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam nl_NL.UTF-8 |
147 |
|
+Português pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo pt_BR.UTF-8 |
148 |
|
+Slovenski sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana sl_SI.UTF-8 |
149 |
|
+Svensk sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm sv_SE.UTF-8 |
150 |
|
--- anaconda-10.1.1.81/packages.py.sme 2008-03-17 11:02:31.000000000 -0600 |
151 |
|
+++ anaconda-10.1.1.81/packages.py 2008-03-17 11:07:55.000000000 -0600 |
152 |
|
@@ -1610,7 +1610,7 @@ |
153 |
|
"from testers, and it is not suitable " |
154 |
|
"for day to day usage.\n\n" |
155 |
|
"To report feedback, please visit:\n\n" |
156 |
|
- " http://www.centos.orrg/bugs\n\n" |
157 |
|
+ " http://bugs.contribs.org/\n\n" |
158 |
|
"and file a report against '%s'.\n" |
159 |
|
%(productName, fileagainst)), |
160 |
|
type="custom", custom_icon="warning", |
161 |
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 |
162 |
--- 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 |
163 |
+++ 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 |
374 |
- else: |
- else: |
375 |
- devname = drive |
- devname = drive |
376 |
- partList.append("%s (%s)" %(desc, drive)) |
- partList.append("%s (%s)" %(desc, drive)) |
377 |
+ partList.append("Upgrade existing \"%s\" system" %(desc)) |
+ partList.append(_("Upgrade existing \"%s\" system") %(desc)) |
378 |
|
|
379 |
(button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), |
(button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), |
380 |
- _("One or more existing Linux installations " |
- _("One or more existing Linux installations " |
396 |
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 |
397 |
--- 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 |
398 |
+++ 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 |
399 |
@@ -38,6 +38,21 @@ |
@@ -49,6 +49,21 @@ |
400 |
upgrade_remove_blacklist = () |
upgrade_remove_blacklist = ( ("samba","ppc64"),) |
401 |
|
|
402 |
def findRootParts(intf, id, dispatch, dir, chroot): |
def findRootParts(intf, id, dispatch, dir, chroot): |
403 |
+# w = intf.waitWindow(_("Converting to RAID"), |
+# w = intf.waitWindow(_("Converting to RAID"), |
404 |
+# _("Converting to RAID, this may take several minutes...")) |
+# _("Converting to RAID, this may take several minutes...")) |
418 |
if dir == DISPATCH_BACK: |
if dir == DISPATCH_BACK: |
419 |
return |
return |
420 |
if id.rootParts is None: |
if id.rootParts is None: |
421 |
@@ -49,7 +64,7 @@ |
@@ -60,7 +75,7 @@ |
422 |
|
|
423 |
if id.rootParts is not None and len(id.rootParts) > 0: |
if id.rootParts is not None and len(id.rootParts) > 0: |
424 |
dispatch.skipStep("findinstall", skip = 0) |
dispatch.skipStep("findinstall", skip = 0) |
427 |
dispatch.skipStep("installtype", skip = 1) |
dispatch.skipStep("installtype", skip = 1) |
428 |
else: |
else: |
429 |
dispatch.skipStep("findinstall", skip = 1) |
dispatch.skipStep("findinstall", skip = 1) |
430 |
@@ -501,10 +516,10 @@ |
@@ -513,10 +528,10 @@ |
431 |
pass |
pass |
432 |
sys.exit(0) |
sys.exit(0) |
433 |
|
|
440 |
"that this is not a %s system. " |
"that this is not a %s system. " |
441 |
"Continuing with the upgrade process may " |
"Continuing with the upgrade process may " |
442 |
"leave the system in an unusable state. Do " |
"leave the system in an unusable state. Do " |
443 |
@@ -521,7 +536,7 @@ |
@@ -533,7 +548,7 @@ |
444 |
# Figure out current version for upgrade nag and for determining weird |
# Figure out current version for upgrade nag and for determining weird |
445 |
# upgrade cases |
# upgrade cases |
446 |
supportedUpgradeVersion = -1 |
supportedUpgradeVersion = -1 |
449 |
for h in mi: |
for h in mi: |
450 |
if h[rpm.RPMTAG_EPOCH] is None: |
if h[rpm.RPMTAG_EPOCH] is None: |
451 |
epoch = None |
epoch = None |
452 |
@@ -529,7 +544,7 @@ |
@@ -541,7 +556,7 @@ |
453 |
epoch = str(h[rpm.RPMTAG_EPOCH]) |
epoch = str(h[rpm.RPMTAG_EPOCH]) |
454 |
|
|
455 |
if supportedUpgradeVersion <= 0: |
if supportedUpgradeVersion <= 0: |
458 |
(epoch, h[rpm.RPMTAG_VERSION], |
(epoch, h[rpm.RPMTAG_VERSION], |
459 |
h[rpm.RPMTAG_RELEASE])) |
h[rpm.RPMTAG_RELEASE])) |
460 |
if val > 0: |
if val > 0: |
461 |
@@ -538,9 +553,6 @@ |
@@ -550,9 +565,6 @@ |
462 |
supportedUpgradeVersion = 1 |
supportedUpgradeVersion = 1 |
463 |
break |
break |
464 |
|
|