diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-04-23 15:54:10 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-04-23 15:54:10 +0000 |
| commit | 2f2093fdc69e6e6d30bb9471e311cc1794df91b8 (patch) | |
| tree | 8ea5cf31c2c033b9174c284e1c56304b05b39500 | |
| parent | 1dfa428e543aa5b4cbfe1704d0c2bc5d8a71525d (diff) | |
| download | drakx-2f2093fdc69e6e6d30bb9471e311cc1794df91b8.tar drakx-2f2093fdc69e6e6d30bb9471e311cc1794df91b8.tar.gz drakx-2f2093fdc69e6e6d30bb9471e311cc1794df91b8.tar.bz2 drakx-2f2093fdc69e6e6d30bb9471e311cc1794df91b8.tar.xz drakx-2f2093fdc69e6e6d30bb9471e311cc1794df91b8.zip | |
(selectInstallClass) fix not offering to upgrade 32 bit installations
(regression introduced by pterjan in r255238 on 2009-03-31: "Don't list
installed distros with other archs as ugrading betweenarchs is not supported")
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 175d4af07..d3151b8ae 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- fix not offering to upgrade 32 bit installations - handle virtio block devices Version 12.32 - 23 April 2009 diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 6e8d8a020..27748413a 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -127,7 +127,8 @@ sub selectInstallClass { 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; + my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch(); + @l = grep { $_->{arch} eq $arch } @l; if (@l) { log::l("proposing to upgrade partitions " . join(" ", map { $_->{part} && $_->{part}{device} } @l)); |