summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-08 15:57:52 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-08 15:57:52 +0000
commit9e9fd4f3bd7a22b94d1f72f28f1f7f944324e26b (patch)
treef6080a81c6975fb03b4ccf97d80dbff249ce595a
parent6186808878a5e186e430484ad9e7c19113c366df (diff)
downloaddrakx-9e9fd4f3bd7a22b94d1f72f28f1f7f944324e26b.tar
drakx-9e9fd4f3bd7a22b94d1f72f28f1f7f944324e26b.tar.gz
drakx-9e9fd4f3bd7a22b94d1f72f28f1f7f944324e26b.tar.bz2
drakx-9e9fd4f3bd7a22b94d1f72f28f1f7f944324e26b.tar.xz
drakx-9e9fd4f3bd7a22b94d1f72f28f1f7f944324e26b.zip
once we identify the protocal, skip remaining tests
-rw-r--r--perl-install/printer/printerdrake.pm15
1 files changed, 7 insertions, 8 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index c1ede6e13..b85bd1318 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -1124,26 +1124,25 @@ complete => sub {
# Non-local printer, check network and abort if no network available
if ($printer->{currentqueue}{connect} !~ m!^(file|ptal):/! &&
- !check_network($printer, $in, $upNetwork, 0)) { return 0 };
-
+ !check_network($printer, $in, $upNetwork, 0)) {
+ return 0;
+ }
# If the chosen protocol needs additional software, install it.
# LPD does not support filtered queues to a remote LPD server by itself
# It needs an additional program as "rlpr"
- if ($printer->{currentqueue}{connect} =~ /^lpd:/ &&
+ elsif ($printer->{currentqueue}{connect} =~ /^lpd:/ &&
$printer->{SPOOLER} eq 'lpd' && !$::testing && !files_exist('/usr/bin/rlpr')) {
$in->do_pkgs->install('rlpr');
- }
- if ($printer->{currentqueue}{connect} =~ /^smb:/ &&
+ } elsif ($printer->{currentqueue}{connect} =~ /^smb:/ &&
!$::testing && !files_exist('/usr/bin/smbclient')) {
$in->do_pkgs->install('samba-client');
- }
- if ($printer->{currentqueue}{connect} =~ /^ncp:/ &&
+ } elsif ($printer->{currentqueue}{connect} =~ /^ncp:/ &&
!$::testing && !files_exist('/usr/bin/nprint')) {
$in->do_pkgs->install('ncpfs');
}
#- LPD and LPRng need netcat ('nc') to access to socket printers
- if ($printer->{currentqueue}{connect} =~ /^socket:/ &&
+ elsif ($printer->{currentqueue}{connect} =~ /^socket:/ &&
($printer->{SPOOLER} eq 'lpd' || $printer->{SPOOLER} eq 'lprng') &&
!$::testing && !files_exist('/usr/bin/nc')) {
$in->do_pkgs->install('nc');