summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-31 15:54:54 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-31 15:54:54 +0000
commitbb15bfa73adaf61795842da094ee7d24dc778580 (patch)
tree2c1466f18221b45e26dd539bb2c1ba8e66a6f0d8 /perl-install/install
parent9ebca2b8642d5f6d3cd647dde99e55bd762a9e14 (diff)
downloaddrakx-bb15bfa73adaf61795842da094ee7d24dc778580.tar
drakx-bb15bfa73adaf61795842da094ee7d24dc778580.tar.gz
drakx-bb15bfa73adaf61795842da094ee7d24dc778580.tar.bz2
drakx-bb15bfa73adaf61795842da094ee7d24dc778580.tar.xz
drakx-bb15bfa73adaf61795842da094ee7d24dc778580.zip
(selectInstallClass) prevent displaying empty list choice after last
commit (r255239 from pterjan, was: "display the version of the distro in the install/upgrade screen (#44602)")
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/steps_interactive.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index baeb05415..aa2b42e1d 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -125,9 +125,10 @@ sub selectKeyboard {
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;
+ 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;
+ if (@l) {
log::l("proposing to upgrade partitions " . join(" ", map { $_->{part} && $_->{part}{device} } @l));