From 78e8097c578fb334c7440a5459fdb7aecc827feb Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 14 Nov 2002 17:36:32 +0000
Subject: - add/remove spaces to make perl_checker happy - remove redundant
 parentheses - add some parentheses for clarity

---
 perl-install/harddrake/data.pm | 4 ++--
 perl-install/harddrake/ui.pm   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install/harddrake')

diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 25909bb2d..479623d9d 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -11,7 +11,7 @@ my @devices = detect_devices::probeall(1);
 
 # Update me each time you handle one more devices class (aka configurator)
 sub unknown {
-    grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI|OTHER)|BRIDGE|NETWORK/) && ($_->{driver} ne '^(scanner|usbvideo)$') && $_->{type} ne 'network' && $_->{driver} !~ /Mouse:USB|class\|Mouse/ } @devices;
+    grep { $_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI|OTHER)|BRIDGE|NETWORK/ && $_->{driver} ne '^(scanner|usbvideo)$' && $_->{type} ne 'network' && $_->{driver} !~ /Mouse:USB|class\|Mouse/ } @devices;
 }
 
 
@@ -28,7 +28,7 @@ our @tree =
      ["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') || $_->{driver} eq 'usbvision' } @devices }, 0 ],     
+     ["TV", "Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} eq 'PCI' || $_->{driver} eq 'usbvision' } @devices }, 0 ],     
      ["MULTIMEDIA_OTHER", "Other MultiMedia devices", "multimedia.png", "", sub { grep { $_->{media_type} =~ /MULTIMEDIA_OTHER/ } @devices }, 0 ],
      ["AUDIO", "Soundcard", "sound.png", "$sbindir/draksound", sub { grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO/ } @devices }, 0 ],
      ["WEBCAM", "Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} ne 'PCI' } @devices }, 0 ],
diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index b6e6da7b2..34c9a670d 100644
--- a/perl-install/harddrake/ui.pm
+++ b/perl-install/harddrake/ui.pm
@@ -148,7 +148,7 @@ sub detect {
             if (exists $_->{bus} && $_->{bus} eq 'ide') {
                 $_->{channel} = $_->{channel} ? N("secondary") : N("primary");
                 delete $_->{info};
-            } elsif ((exists $_->{id}) && ($_->{bus} ne 'PCI')) {
+            } elsif ((exists $_->{id}) && $_->{bus} ne 'PCI') {
                 # SCSI detection incoherency:
                 my $i = $_;
                 $_->{bus_location} = join ':', map { sprintf("%lx", $i->{$_}) } qw(bus id);
@@ -226,7 +226,7 @@ sub new {
             foreach my $i (sort keys %$current_device) {
                 if ($fields{$i}[0]) {
                     $text->insert("", $text->style->black, "", $fields{$i}[0] . ": ");
-                    $text->insert("", ($i eq 'driver' && $current_device->{$i} eq 'unknown') ? $wcolor : $color,
+                    $text->insert("", $i eq 'driver' && $current_device->{$i} eq 'unknown' ? $wcolor : $color,
                                   "", "$current_device->{$i}\n\n");
                 } else { print "Skip \"$i\" field => \"$current_device->{$i}\"\n\n" }
             }
-- 
cgit v1.2.1