From c2b44f66b9d3bccd78764b208feaa9d9a119a0a1 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 19 Apr 2000 13:36:08 +0000 Subject: no_comment --- perl-install/printerdrake.pm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'perl-install/printerdrake.pm') diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index 40e6948b6..0d322e4ef 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -13,18 +13,23 @@ use printer; 1; -sub setup_local($$$) { - my ($printer, $in, $install) = @_; - +sub auto_detect { + my ($in) = @_; { my $w = $in->wait_message(_("Test ports"), _("Detecting devices...")); eval { modules::load("parport_pc"); modules::load("parport_probe"); modules::load("lp"); }; } + my $b = before_leaving { eval { modules::unload("parport_probe") } }; + detect_devices::whatPrinter(); +} + + +sub setup_local($$$) { + my ($printer, $in, $install) = @_; my @port = (); my @str = (); - my @parport = detect_devices::whatPrinter(); - eval { modules::unload("parport_probe") }; + my @parport = auto_detect(); foreach (@parport) { push @str, _("A printer, model \"%s\", has been detected on ", $_->{val}{DESCRIPTION}) . $_->{port}; } -- cgit v1.2.1