summaryrefslogtreecommitdiffstats
path: root/perl-install/printer
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-11-13 16:40:02 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-11-13 16:40:02 +0000
commit05c4274a8b44607bf6b2bbed8f9a0d13bc6b7235 (patch)
treed367c3e5645cac42fb0b297985e48a7013d8e39c /perl-install/printer
parent4581ea0d90fa16fafd393a9fa31f670179b14004 (diff)
downloaddrakx-05c4274a8b44607bf6b2bbed8f9a0d13bc6b7235.tar
drakx-05c4274a8b44607bf6b2bbed8f9a0d13bc6b7235.tar.gz
drakx-05c4274a8b44607bf6b2bbed8f9a0d13bc6b7235.tar.bz2
drakx-05c4274a8b44607bf6b2bbed8f9a0d13bc6b7235.tar.xz
drakx-05c4274a8b44607bf6b2bbed8f9a0d13bc6b7235.zip
simplify install_spooler() but there's still lot of duplication there
(some work for tomorow)
Diffstat (limited to 'perl-install/printer')
-rw-r--r--perl-install/printer/printerdrake.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 225d9a0bd..5eab8b77f 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -2692,9 +2692,7 @@ sub install_spooler {
$in->do_pkgs->install(('cups', 'net-tools', 'xpp',
($::expert ? 'cups-drivers' : ())));
}
- if ((!$::testing) &&
- ((!files_exist((qw(/usr/bin/wget)))) &&
- (!files_exist((qw(/usr/bin/curl)))))) {
+ if (!$::testing && !files_exist(qw(/usr/bin/wget /usr/bin/curl))) {
$in->do_pkgs->install($::isInstall ? 'curl' : 'webfetch');
}
# Try to start the network when CUPS is the spooler, so that