summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-08-23 19:33:14 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-08-23 19:33:14 +0000
commit98f5edd4de106d081414494f7e18470690b6faa8 (patch)
tree0115c9742e1c8fb57fb5311915766e7822a2f016
parentcef02125408009f292e059e303cc43d15adbcd37 (diff)
downloaddrakx-98f5edd4de106d081414494f7e18470690b6faa8.tar
drakx-98f5edd4de106d081414494f7e18470690b6faa8.tar.gz
drakx-98f5edd4de106d081414494f7e18470690b6faa8.tar.bz2
drakx-98f5edd4de106d081414494f7e18470690b6faa8.tar.xz
drakx-98f5edd4de106d081414494f7e18470690b6faa8.zip
20mdk:
- florin fixes for firewalling - check that alternative is unknown, not the current driver, before saying that there's no alternative. anyway, our only caller cannot get there's with a current unknown driver since he only try listed/know drivers ....
-rw-r--r--perl-install/drakxtools.spec7
-rw-r--r--perl-install/harddrake/sound.pm3
2 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index 02d6d7331..9c2e6602e 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -1,7 +1,7 @@
Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...)
Name: drakxtools
Version: 1.1.9
-Release: 19mdk
+Release: 20mdk
Url: http://www.linux-mandrake.com/en/drakx.php3
Source0: %name-%version.tar.bz2
License: GPL
@@ -262,6 +262,11 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && \
%config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http
%changelog
+* Fri Aug 23 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 1.1.9-20mdk
+- draksound: display right message ("no alternative") when no
+ alternative rather than "no known module"
+- fixes for multiple NIC boxes (florin)
+
* Fri Aug 23 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 1.1.9-19mdk
- draksound: use right sound slot
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index d1af14606..dc25af4fb 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -151,7 +151,7 @@ sub switch {
my $alternative = get_alternative($driver);
if ($alternative) {
my $new_driver = $alternative->[0];
- if ($driver eq "unknown") {
+ if ($new_driver eq "unknown") {
$in->ask_warn(_("No alternative driver"),
_("There's no known OSS/ALSA alternative driver for your sound card (%s)",
$device->{description}));
@@ -172,7 +172,6 @@ sub switch {
$in->ask_warn(_("No known driver"),
_("There's no known driver for your sound card (%s)",
$device->{description}));
- } elsif (is_listed($driver)) {
} else {
$in->ask_warn(_("Unkown driver"),
_("The \"%s\" driver for your sound card is unlisted\n