summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2012-05-10 22:46:24 +0000
committerOlivier Blin <blino@mageia.org>2012-05-10 22:46:24 +0000
commit8d5c81f0ce54ad0d30817f4fed0306ed50939e14 (patch)
treeadc8fb2c665780203fb377d2f8f945c0c7d0464d
parentd654531b9d2dac55268a2be0b3e40aeb4309e8cb (diff)
downloaddrakx-backup-do-not-use-8d5c81f0ce54ad0d30817f4fed0306ed50939e14.tar
drakx-backup-do-not-use-8d5c81f0ce54ad0d30817f4fed0306ed50939e14.tar.gz
drakx-backup-do-not-use-8d5c81f0ce54ad0d30817f4fed0306ed50939e14.tar.bz2
drakx-backup-do-not-use-8d5c81f0ce54ad0d30817f4fed0306ed50939e14.tar.xz
drakx-backup-do-not-use-8d5c81f0ce54ad0d30817f4fed0306ed50939e14.zip
harddrake2: allow writing 0 as module option, and forbid options with spaces (from Colin)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/modules/interactive.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 9bb7bf644..da3f36af5 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- harddrake2: allow writing 0 as module option, and forbid options
+ with spaces (from Colin)
- export res_init function to perl lib
Version 14.20 - 6 May 2012
diff --git a/perl-install/modules/interactive.pm b/perl-install/modules/interactive.pm
index 956d98bd1..abb1e9a82 100644
--- a/perl-install/modules/interactive.pm
+++ b/perl-install/modules/interactive.pm
@@ -20,7 +20,7 @@ sub config_window {
return;
}
if ($in->ask_from(N("Module configuration"), N("You can configure each parameter of the module here."), \@l)) {
- my $options = join(' ', map { if_($conf{$_}, "$_=$conf{$_}") } keys %conf);
+ my $options = join(' ', map { if_($conf{$_} =~ /^\S+$/, "$_=$conf{$_}") } keys %conf);
my $old_options = $modules_conf->get_options($data->{driver});
if ($options ne $old_options) {
$modules_conf->set_options($data->{driver}, $options);