summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-03-10 10:16:36 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-03-10 10:16:36 +0000
commit33f1402f943036dbdf81bf12ded852c8eba91fd9 (patch)
treeb67fde0af3eae80608651905d123ed4ec8c028c9
parent1f52726a133e2ede4736a9cd2a355aac242fe9e0 (diff)
downloaddrakx-33f1402f943036dbdf81bf12ded852c8eba91fd9.tar
drakx-33f1402f943036dbdf81bf12ded852c8eba91fd9.tar.gz
drakx-33f1402f943036dbdf81bf12ded852c8eba91fd9.tar.bz2
drakx-33f1402f943036dbdf81bf12ded852c8eba91fd9.tar.xz
drakx-33f1402f943036dbdf81bf12ded852c8eba91fd9.zip
diskdrake: don't crash when creating a partition in LVM with the partition type buttons (#38078)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/diskdrake/hd_gtk.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index aae113bbb..733175712 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,8 @@
- handle new drivers:
o wireless: wl
+- diskdrake:
+ o don't crash when creating a partition in LVM with the partition type
+ buttons (#38078)
Version 12.5 - 5 March 2009
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index b52d3f98f..a29adca79 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -357,7 +357,7 @@ sub create_buttons4partitions {
# disks: helpers
################################################################################
sub current_hd() {
- $current_kind->{type} eq 'hd' or die 'current_hd called but $current_kind is not an hd ('.$current_kind->{type}.')';
+ $current_kind->{type} =~ /hd|lvm/ or die 'current_hd called but $current_kind is not an hd ('.$current_kind->{type}.')';
$current_kind->{val};
}
sub current_part() {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a2b2c977c..380ab1c3a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- don't crash when creating a partition in LVM with the partition type
+ buttons (#38078)
+
Version 12.12 - 9 March 2009
- use new urpmi API in order to fix detecting whether installing