summaryrefslogtreecommitdiffstats
path: root/perl-install/harddrake
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-03-17 18:05:23 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-03-17 18:05:23 +0000
commit80b6b5d6cbcc7157abfcda55226c6b3a30766ebe (patch)
tree0bd076837d205491becedbe389c3b336742db8ac /perl-install/harddrake
parent4501cfbb2e9cde040e891961630d222363fe6031 (diff)
downloaddrakx-backup-do-not-use-80b6b5d6cbcc7157abfcda55226c6b3a30766ebe.tar
drakx-backup-do-not-use-80b6b5d6cbcc7157abfcda55226c6b3a30766ebe.tar.gz
drakx-backup-do-not-use-80b6b5d6cbcc7157abfcda55226c6b3a30766ebe.tar.bz2
drakx-backup-do-not-use-80b6b5d6cbcc7157abfcda55226c6b3a30766ebe.tar.xz
drakx-backup-do-not-use-80b6b5d6cbcc7157abfcda55226c6b3a30766ebe.zip
do not alter oss<->alsa drivers mapping table (olivier blin, #8501)
Diffstat (limited to 'perl-install/harddrake')
-rw-r--r--perl-install/harddrake/sound.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 641b94457..1f1470dec 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -172,13 +172,13 @@ sub switch {
my $driver = $device->{current_driver} || $device->{driver};
foreach (@blacklist) { $blacklisted = 1 if $driver eq $_ }
- my $alternative = get_alternative($driver);
- unless ($driver eq $device->{driver} or member($device->{driver}, @$alternative)) {
- push @$alternative, @{get_alternative($device->{driver})}, $device->{driver}
+ my @alternative = @{get_alternative($driver)};
+ unless ($driver eq $device->{driver} or member($device->{driver}, @alternative)) {
+ push @alternative, @{get_alternative($device->{driver})}, $device->{driver}
}
- if ($alternative) {
+ if (@alternative) {
my $new_driver = $driver;
- push @$alternative, $driver;
+ push @alternative, $driver;
my %des = modules::category2modules_and_description('multimedia/sound');
if ($new_driver eq 'unknown') {
@@ -209,8 +209,8 @@ To use alsa, one can either use:
},
[
{
- label => N("Driver:"), val => \$new_driver, list => $alternative, default => $new_driver, sort =>1,
- help => join("\n\n", map { qq("$_": ) . $des{$_} } @$alternative),
+ label => N("Driver:"), val => \$new_driver, list => \@alternative, default => $new_driver, sort =>1,
+ help => join("\n\n", map { qq("$_": ) . $des{$_} } @alternative),
allow_empty_list => 1,
},
{