From 4006b6abce88b7a53502926f921ae1408b5dd37e Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 13 Nov 2002 11:46:04 +0000 Subject: add/remove spaces to make perl_checker happy --- perl-install/harddrake/data.pm | 48 ++++++++++++++++++++--------------------- perl-install/harddrake/sound.pm | 2 +- perl-install/harddrake/ui.pm | 6 +++--- perl-install/harddrake/v4l.pm | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) (limited to 'perl-install/harddrake') diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index e6a6e362f..25909bb2d 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -21,19 +21,19 @@ sub unknown { our @tree = ( - ["FLOPPY","Floppy", "floppy.png", "",\&detect_devices::floppies, 0 ], - ["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 ], - ["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 ], - ["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 ], - ["CPU","Processors", "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ], - ["ETHERNET","Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub { + ["FLOPPY", "Floppy", "floppy.png", "", \&detect_devices::floppies, 0 ], + ["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 ], + ["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 ], + ["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 ], + ["CPU", "Processors", "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ], + ["ETHERNET", "Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub { #- generic NIC detection for USB seems broken (class, subclass, #- protocol report are not accurate) so I'll need to verify against #- known drivers :-( @@ -41,25 +41,25 @@ our @tree = # should be taken from detect_devices.pm or modules.pm. it's identical grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} eq 'network' } @devices }, 1 ], - ["MODEM","Modem", "modem.png", "", sub { detect_devices::getModem() }, 0 ], - ["BRIDGE","Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ /BRIDGE/ } @devices }, 0 ], - ["UNKNOWN","Unknown/Others", "unknown.png", "", \&unknown, 0 ], + ["MODEM", "Modem", "modem.png", "", sub { detect_devices::getModem() }, 0 ], + ["BRIDGE", "Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ /BRIDGE/ } @devices }, 0 ], + ["UNKNOWN", "Unknown/Others", "unknown.png", "", \&unknown, 0 ], - ["PRINTER","Printer", "hw_printer.png", "$sbindir/printerdrake", sub { + ["PRINTER", "Printer", "hw_printer.png", "$sbindir/printerdrake", sub { require printer::detect; printer::detect::detect() }, 0 ], - ["SCANNER","Scanner", "scanner.png", "$sbindir/scannerdrake", sub { + ["SCANNER", "Scanner", "scanner.png", "$sbindir/scannerdrake", sub { require scanner; scanner::detect() }, 0 ], - ["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { + ["MOUSE", "Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { require mouse; require modules; modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; &mouse::detect() }, 1 ], - ["JOYSTICK","Joystick", "joystick.png", "", sub {}, 0 ], + ["JOYSTICK", "Joystick", "joystick.png", "", sub {}, 0 ], - ["ATA_STORAGE","(E)IDE/ATA controllers", "ide_hd.png", "", sub { grep { $_->{media_type} =~ /STORAGE_(IDE|OTHER)/ } @devices }, 0 ], - ["SCSI_CONTROLLER","SCSI controllers", "scsi.png", "", sub { grep { $_->{media_type} =~ /STORAGE_SCSI/ } @devices }, 0 ], - ["USB_CONTROLLER","USB controllers", "usb.png", "", sub { grep { $_->{media_type} =~ /SERIAL_USB/ } @devices }, 0 ], - ["SMB_CONTROLLER","SMBus controllers", "usb.png", "", sub { grep { $_->{media_type} =~ /SERIAL_SMBUS/ } @devices }, 0 ], + ["ATA_STORAGE", "(E)IDE/ATA controllers", "ide_hd.png", "", sub { grep { $_->{media_type} =~ /STORAGE_(IDE|OTHER)/ } @devices }, 0 ], + ["SCSI_CONTROLLER", "SCSI controllers", "scsi.png", "", sub { grep { $_->{media_type} =~ /STORAGE_SCSI/ } @devices }, 0 ], + ["USB_CONTROLLER", "USB controllers", "usb.png", "", sub { grep { $_->{media_type} =~ /SERIAL_USB/ } @devices }, 0 ], + ["SMB_CONTROLLER", "SMBus controllers", "usb.png", "", sub { grep { $_->{media_type} =~ /SERIAL_SMBUS/ } @devices }, 0 ], ); diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 15d7ad7df..5b85116c8 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -200,7 +200,7 @@ To use alsa, one can either use: $in->ask_warn(N("Warning"), N("The old \"%s\" driver is blacklisted.\n It has been reported to oopses the kernel on unloading.\n The new \"%s\" driver'll only be used on next bootstrap.", $driver, $new_driver)) if $blacklisted; - my $wait = $in->wait_message(N("Please wait"),N("Please Wait... Applying the configuration")); + my $wait = $in->wait_message(N("Please wait"), N("Please Wait... Applying the configuration")); do_switch($driver, $new_driver); undef $wait; } diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm index 6223c7be5..887245784 100644 --- a/perl-install/harddrake/ui.pm +++ b/perl-install/harddrake/ui.pm @@ -137,11 +137,11 @@ sub detect { $_->{bus_location} = join ':', map { sprintf("%lx", $i->{$_}) } qw(pci_bus pci_device pci_function); } # split description into manufacturer/description - ($_->{Vendor}, $_->{description}) = split(/\|/,$_->{description}) if exists $_->{description}; + ($_->{Vendor}, $_->{description}) = split(/\|/, $_->{description}) if exists $_->{description}; if (exists $_->{val}) { # Scanner ? my $val = $_->{val}; - ($_->{Vendor},$_->{description}) = split(/\|/, $val->{DESCRIPTION}); + ($_->{Vendor}, $_->{description}) = split(/\|/, $val->{DESCRIPTION}); } # EIDE detection incoherency: if (exists $_->{bus} && $_->{bus} eq 'ide') { @@ -276,7 +276,7 @@ sub new { } $SIG{CHLD} = sub { undef $pid; $statusbar->pop($sig_id) }; - $w->{rwindow}->signal_connect (delete_event => \&quit_global); + $w->{rwindow}->signal_connect(delete_event => \&quit_global); undef $wait; gtkset_mousecursor_normal(); $w->{rwindow}->set_position('center') unless $::isEmbedded; diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm index 2ec3f36d0..ce944adcb 100644 --- a/perl-install/harddrake/v4l.pm +++ b/perl-install/harddrake/v4l.pm @@ -200,7 +200,7 @@ my %pll_lst = -1 => N("Default"), 0 => "don't use pll", 1 => "28 Mhz Crystal (X)", - 2 =>"35 Mhz Crystal" + 2 => "35 Mhz Crystal" ); sub config { -- cgit v1.2.1