summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-03-31 09:07:55 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-03-31 09:07:55 +0000
commit3b4006b06c2cbbe24082ead5cdcae4f232c210fd (patch)
treef088bf566f2a8f0507864aefdba20cb0d0a99488
parent6ea3ca5dc36498700b624c87788700e29ba38de3 (diff)
downloaddrakx-backup-do-not-use-3b4006b06c2cbbe24082ead5cdcae4f232c210fd.tar
drakx-backup-do-not-use-3b4006b06c2cbbe24082ead5cdcae4f232c210fd.tar.gz
drakx-backup-do-not-use-3b4006b06c2cbbe24082ead5cdcae4f232c210fd.tar.bz2
drakx-backup-do-not-use-3b4006b06c2cbbe24082ead5cdcae4f232c210fd.tar.xz
drakx-backup-do-not-use-3b4006b06c2cbbe24082ead5cdcae4f232c210fd.zip
Don't list installed distros with other archs as ugrading betweenarchs is not supported
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm12
2 files changed, 5 insertions, 9 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 5c9a73241..018075ee4 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -3,6 +3,8 @@
- make button name match text when inserting a CD ("cancel" rather
than "previous")
- rotate /root/drakx/install1.log too
+- don't list installed distros with other archs as ugrading between
+ archs is not supported
Version 12.21 - 30 March 2009
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index ad2f90a19..fff933b8d 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -126,6 +126,9 @@ sub selectInstallClass {
my ($o) = @_;
if (my @l = install::any::find_root_parts($o->{fstab}, $::prefix)) {
+ # Don't list other archs as ugrading between archs is not supported
+ @l = grep { $_->{arch} eq arch() } @l;
+
log::l("proposing to upgrade partitions " . join(" ", map { $_->{part} && $_->{part}{device} } @l));
my @releases = uniq(map { $_->{release} } @l);
@@ -147,15 +150,6 @@ sub selectInstallClass {
format => sub { ref($_[0]) ? N("Upgrade %s", $_[0]{release}) : translate($_[0]) }
} ]);
if (ref $p) {
- if (arch() =~ /x86_64/ && $p->{arch} eq 'i586') {
- $o->ask_warn('', N("Upgrade from a 32bit to a 64bit distribution is not supported"));
- goto askInstallClass;
- }
- if (arch() =~ /i.86/ && $p->{arch} eq 'x86_64') {
- $o->ask_warn('', N("Upgrade from a 64bit to a 32bit distribution is not supported"));
- goto askInstallClass;
- }
-
_check_unsafe_upgrade_and_warn($o, $p->{part}) or $p = undef;
}