summaryrefslogtreecommitdiffstats
path: root/perl-install/harddrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-11-06 19:24:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-11-06 19:24:03 +0000
commit12e2b5c87a379eec81c5e2d80b67493689691082 (patch)
tree102f4af9d8bcd168175a4f4dddda3e5862d82c70 /perl-install/harddrake
parent41ba541d10a02a787d5fe4974a9c389093c3b155 (diff)
downloaddrakx-backup-do-not-use-12e2b5c87a379eec81c5e2d80b67493689691082.tar
drakx-backup-do-not-use-12e2b5c87a379eec81c5e2d80b67493689691082.tar.gz
drakx-backup-do-not-use-12e2b5c87a379eec81c5e2d80b67493689691082.tar.bz2
drakx-backup-do-not-use-12e2b5c87a379eec81c5e2d80b67493689691082.tar.xz
drakx-backup-do-not-use-12e2b5c87a379eec81c5e2d80b67493689691082.zip
make perl_checker happy
Diffstat (limited to 'perl-install/harddrake')
-rw-r--r--perl-install/harddrake/data.pm2
-rw-r--r--perl-install/harddrake/sound.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 372ce504b..2392ff82d 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -25,7 +25,7 @@ our @tree =
["HARDDISK","Disk", "harddisk.png", "$sbindir/diskdrake", \&detect_devices::hds, 1 ],
["CDROM","CDROM", "cd.png", "", sub { grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms } , 0 ],
["BURNER","CD/DVD burners", "cd.png", "", \&detect_devices::burners(), 0 ],
- ["DVDROM","DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms}, 0 ],
+ ["DVDROM","DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms() }, 0 ],
["TAPE","Tape", "tape.png", "", \&detect_devices::tapes, 0 ],
["VIDEO","Videocard", "video.png", "$sbindir/XFdrake", sub { grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ 'DISPLAY_VGA' } @devices }, 1 ],
["TV","Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} eq 'PCI' } @devices}, 0 ],
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index a1da2d25f..48e8ffbff 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -158,7 +158,7 @@ sub do_switch {
sub switch {
my ($in, $device) = @_;
my $driver = $device->{current_driver};
- $driver = $device->{driver} unless $driver;
+ $driver ||= $device->{driver};
foreach (@blacklist) { $blacklisted = 1 if $driver eq $_ }
my $alternative = get_alternative($driver);