diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-07-08 07:45:08 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-07-08 07:45:08 +0000 |
| commit | 9555bb791920e8feace953f90cf908e864451b59 (patch) | |
| tree | ecabc98ad8cb1019c81cf321ea5418d679950482 /perl-install/harddrake | |
| parent | 71c714077ded40469aa5887b939a60723308dba5 (diff) | |
| download | drakx-backup-do-not-use-9555bb791920e8feace953f90cf908e864451b59.tar drakx-backup-do-not-use-9555bb791920e8feace953f90cf908e864451b59.tar.gz drakx-backup-do-not-use-9555bb791920e8feace953f90cf908e864451b59.tar.bz2 drakx-backup-do-not-use-9555bb791920e8feace953f90cf908e864451b59.tar.xz drakx-backup-do-not-use-9555bb791920e8feace953f90cf908e864451b59.zip | |
various cleanups:
- move all harddrake modules to harddrake namespace
- replace two use by require so that it's not done at compil time
but at runtime
- there was a missing $ in harddrake::ui.pm
Diffstat (limited to 'perl-install/harddrake')
| -rw-r--r-- | perl-install/harddrake/bttv.pm | 4 | ||||
| -rw-r--r-- | perl-install/harddrake/data.pm | 4 | ||||
| -rw-r--r-- | perl-install/harddrake/ui.pm | bin | 9481 -> 9526 bytes |
3 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/harddrake/bttv.pm b/perl-install/harddrake/bttv.pm index c9464158e..3c3802609 100644 --- a/perl-install/harddrake/bttv.pm +++ b/perl-install/harddrake/bttv.pm @@ -1,4 +1,4 @@ -package bttv; +package harddrake::bttv; use strict; @@ -204,7 +204,7 @@ If your card is misdetected, you can force the right tuner and card types here. my $options = 'radio=' . ($conf{radio} ? 1 : 0) . ' '. join(' ', map { if_($conf{$_} ne -1, "$_=$conf{$_}") } qw(card pll tuner gbuffers)); - log::l("[harddrake::tv] $options"); + log::l("[harddrake::bttv] $options"); standalone::explanations("modified file /etc/modules.conf ($options)"); modules::set_options("bttv", $options) if $options; } diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index d17b466db..01fa6be00 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -1,4 +1,4 @@ -package data; +package harddrake::data; use strict; use detect_devices; @@ -58,7 +58,7 @@ our @tree = sub { require printerdrake; printerdrake::auto_detect(class_discard->new) } ], ["SCANNER","Scanner", "scanner.png", "$sbindir/scannerdrake", sub { require scanner; scanner::findScannerUsbport() }], - ["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { use mouse; &mouse::detect()}], + ["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { require mouse; &mouse::detect()}], ["JOYSTICK","Joystick", "joystick.png", "", sub {}] # ["","Ideinterface", "Ideinterface.png", "", "STORAGE_IDE"], diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm Binary files differindex 3e5a870d5..4da7b556c 100644 --- a/perl-install/harddrake/ui.pm +++ b/perl-install/harddrake/ui.pm |