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) |
380 |
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 |
381 |
--- 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 |
382 |
+++ 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 |
383 |
@@ -38,6 +38,21 @@ |
@@ -49,6 +49,21 @@ |
384 |
upgrade_remove_blacklist = () |
upgrade_remove_blacklist = ( ("samba","ppc64"),) |
385 |
|
|
386 |
def findRootParts(intf, id, dispatch, dir, chroot): |
def findRootParts(intf, id, dispatch, dir, chroot): |
387 |
+# w = intf.waitWindow(_("Converting to RAID"), |
+# w = intf.waitWindow(_("Converting to RAID"), |
388 |
+# _("Converting to RAID, this may take several minutes...")) |
+# _("Converting to RAID, this may take several minutes...")) |
402 |
if dir == DISPATCH_BACK: |
if dir == DISPATCH_BACK: |
403 |
return |
return |
404 |
if id.rootParts is None: |
if id.rootParts is None: |
405 |
@@ -49,7 +64,7 @@ |
@@ -60,7 +75,7 @@ |
406 |
|
|
407 |
if id.rootParts is not None and len(id.rootParts) > 0: |
if id.rootParts is not None and len(id.rootParts) > 0: |
408 |
dispatch.skipStep("findinstall", skip = 0) |
dispatch.skipStep("findinstall", skip = 0) |
411 |
dispatch.skipStep("installtype", skip = 1) |
dispatch.skipStep("installtype", skip = 1) |
412 |
else: |
else: |
413 |
dispatch.skipStep("findinstall", skip = 1) |
dispatch.skipStep("findinstall", skip = 1) |
414 |
@@ -501,10 +516,10 @@ |
@@ -513,10 +528,10 @@ |
415 |
pass |
pass |
416 |
sys.exit(0) |
sys.exit(0) |
417 |
|
|
424 |
"that this is not a %s system. " |
"that this is not a %s system. " |
425 |
"Continuing with the upgrade process may " |
"Continuing with the upgrade process may " |
426 |
"leave the system in an unusable state. Do " |
"leave the system in an unusable state. Do " |
427 |
@@ -521,7 +536,7 @@ |
@@ -533,7 +548,7 @@ |
428 |
# Figure out current version for upgrade nag and for determining weird |
# Figure out current version for upgrade nag and for determining weird |
429 |
# upgrade cases |
# upgrade cases |
430 |
supportedUpgradeVersion = -1 |
supportedUpgradeVersion = -1 |
433 |
for h in mi: |
for h in mi: |
434 |
if h[rpm.RPMTAG_EPOCH] is None: |
if h[rpm.RPMTAG_EPOCH] is None: |
435 |
epoch = None |
epoch = None |
436 |
@@ -529,7 +544,7 @@ |
@@ -541,7 +556,7 @@ |
437 |
epoch = str(h[rpm.RPMTAG_EPOCH]) |
epoch = str(h[rpm.RPMTAG_EPOCH]) |
438 |
|
|
439 |
if supportedUpgradeVersion <= 0: |
if supportedUpgradeVersion <= 0: |
442 |
(epoch, h[rpm.RPMTAG_VERSION], |
(epoch, h[rpm.RPMTAG_VERSION], |
443 |
h[rpm.RPMTAG_RELEASE])) |
h[rpm.RPMTAG_RELEASE])) |
444 |
if val > 0: |
if val > 0: |
445 |
@@ -538,9 +553,6 @@ |
@@ -550,9 +565,6 @@ |
446 |
supportedUpgradeVersion = 1 |
supportedUpgradeVersion = 1 |
447 |
break |
break |
448 |
|
|