summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-04-24 21:17:30 +0000
committerPascal Terjan <pterjan@mageia.org>2012-04-24 21:17:30 +0000
commit6f3e6537d28cf9c2de2c4c2427ed5a4e9c9f06d1 (patch)
tree65358d786d5a01644330c4e13acdfbdf5e7bbc90
parentd6a5ac91b53160971b2381b1ec1d6b39e8aaa70f (diff)
downloaddrakx-6f3e6537d28cf9c2de2c4c2427ed5a4e9c9f06d1.tar
drakx-6f3e6537d28cf9c2de2c4c2427ed5a4e9c9f06d1.tar.gz
drakx-6f3e6537d28cf9c2de2c4c2427ed5a4e9c9f06d1.tar.bz2
drakx-6f3e6537d28cf9c2de2c4c2427ed5a4e9c9f06d1.tar.xz
drakx-6f3e6537d28cf9c2de2c4c2427ed5a4e9c9f06d1.zip
fix removing several notebook pages
-rw-r--r--perl-install/diskdrake/hd_gtk.pm12
-rw-r--r--perl-install/install/NEWS2
2 files changed, 11 insertions, 3 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 70f8a3f57..3ccc84d12 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -285,9 +285,15 @@ sub create_automatic_notebooks {
$may_add->(raid2kind()) if @{$all_hds->{raids}};
$may_add->(loopback2kind()) if @{$all_hds->{loopbacks}};
- @notebook = grep_index {
- my $b = $_->{marked} or $notebook_widget->remove_page($::i);
- $b;
+ my $i = 0;
+ @notebook = grep {
+ if ($_->{marked}) {
+ $i++;
+ 1;
+ } else {
+ $notebook_widget->remove_page($i);
+ 0;
+ }
} @notebook;
@notebook or $in->ask_warn(N("Error"), N("No hard disk drives found")), $in->exit(1);
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b321f3278..0263453f3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -5,6 +5,8 @@
o detect LVM on top on Encrypted partitions (mga#5330)
- services:
o systemd support (mga#3253, mga#3740, mga#4910, mga#5122)
+- partitioning wizard:
+ o fix removing several notebook pages
Version 14.10 - 23 April 2012