From bb15bfa73adaf61795842da094ee7d24dc778580 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 31 Mar 2009 15:54:54 +0000 Subject: (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)") --- perl-install/install/steps_interactive.pm | 7 ++++--- 1 file 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)); -- cgit v1.2.1