summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-09-12 12:22:21 +0000
committerThierry Vignaud <tv@mandriva.org>2007-09-12 12:22:21 +0000
commit9b42df99da58a4d877f65c11f8c3d8f40fce3f18 (patch)
tree909a69f22b8ab038810c29403dfb16ffaac2a84e
parentbcec1ffee9cba962ebf17be8094045a58bca4680 (diff)
downloaddrakx-9b42df99da58a4d877f65c11f8c3d8f40fce3f18.tar
drakx-9b42df99da58a4d877f65c11f8c3d8f40fce3f18.tar.gz
drakx-9b42df99da58a4d877f65c11f8c3d8f40fce3f18.tar.bz2
drakx-9b42df99da58a4d877f65c11f8c3d8f40fce3f18.tar.xz
drakx-9b42df99da58a4d877f65c11f8c3d8f40fce3f18.zip
(get_alternative,switch) prevent stupid & useless "driver for your
sound card is unlisted" thus there's no more need to: - list OSS/ALSA alternatives if none - sync draksound with list_modules
-rw-r--r--perl-install/NEWS5
-rw-r--r--perl-install/harddrake/sound.pm6
2 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d1a5d69d3..97ed84954 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,11 @@
o better behaviour when resizing
o use a TextView instead of Label so that text is selectable (see #33023)
o better formatting
+- draksound:
+ o prevent stupid & useless "driver for your sound card is unlisted"
+ o no more need to:
+ * list OSS/ALSA alternatives if none
+ * sync with list_modules
Version 10.4.192 - 12 September 2007, by Olivier "blino" Blin
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index ac7ff6368..8ce19880a 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -193,7 +193,7 @@ sub load {
sub get_alternative {
my ($driver) = @_;
my $list = $alsa2oss{$driver} || $oss2alsa{$driver};
- $list ? @$list : undef;
+ $list ? @$list : "unknown";
}
sub do_switch {
@@ -299,10 +299,6 @@ The new \"%s\" driver will only be used on next bootstrap.", $device->{current_d
N("There's no known driver for your sound card (%s)",
$device->{description}),
[ get_any_driver_entry($in, $modules_conf, $driver, $device) ]);
- } else {
- $in->ask_warn(N("Unknown driver"),
- N("Error: The \"%s\" driver for your sound card is unlisted",
- $driver));
}
end:
}