From c1491d4e98b60a71680ffe22bb8a71c6be683e74 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Apr 2012 18:22:13 +0000 Subject: (fs::partitioning_wizard::main) use newly introduced raid2real_kind() in order to get data about RAID devices, thus fixing: - crashing on selecting a RAID device (calling first_usable_sector on undefined value in partition_table::get_normal_parts_and_holes()) - listing RAID devices (bug introduced in commit r265764 pterjan by on Feb 4 2010: "partitioning wizard: offer to install on dmraid and existing lvm") sadly we trade "calling method on undefined value" for "calling method on unblessed reference" (see next commit) --- perl-install/fs/partitioning_wizard.pm | 2 +- perl-install/install/NEWS | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 5131c9a42..ee7253c65 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -504,7 +504,7 @@ sub main { my $mainbox = Gtk2::VBox->new; my @kinds = map { diskdrake::hd_gtk::hd2kind($_) } sort { $a->{is_removable} <=> $b->{is_removable} } @{ $all_hds->{hds} }; - push @kinds, diskdrake::hd_gtk::raid2kind() if @{$all_hds->{raids}}; + push @kinds, diskdrake::hd_gtk::raid2real_kind($_) foreach @{$all_hds->{raids}}; push @kinds, map { diskdrake::hd_gtk::lvm2kind($_) } @{$all_hds->{lvms}}; my $hdchoice = Gtk2::HBox->new; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index c16156c65..3ff8c7803 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +- partitioning wizard: + o do not crash on selecting a RAID device + o fix listing RAID devices + Version 14.7 - 19 April 2012 - fix a crash when package state is empty (mga#5487) -- cgit v1.2.1