summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2002-09-16 23:03:03 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2002-09-16 23:03:03 +0000
commit45caea467f7c803ec9025db18896d9dfcda69647 (patch)
tree22876161fc93a1831c00235289a77038bdab2590
parent11c7df76313affee5dd2c4fcb26ac7fdd90dcba0 (diff)
downloaddrakx-backup-do-not-use-45caea467f7c803ec9025db18896d9dfcda69647.tar
drakx-backup-do-not-use-45caea467f7c803ec9025db18896d9dfcda69647.tar.gz
drakx-backup-do-not-use-45caea467f7c803ec9025db18896d9dfcda69647.tar.bz2
drakx-backup-do-not-use-45caea467f7c803ec9025db18896d9dfcda69647.tar.xz
drakx-backup-do-not-use-45caea467f7c803ec9025db18896d9dfcda69647.zip
Do not try to install "webfetch" during installation.
-rw-r--r--perl-install/printerdrake.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 61bec7737..d94d0886b 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -2747,18 +2747,21 @@ sub install_spooler {
my $w = $in->wait_message(_("Printerdrake"),
_("Checking installed software..."));
if ((!$::testing) &&
- ((!printer::files_exist((qw(/usr/lib/cups/cgi-bin/printers.cgi
+ (!printer::files_exist((qw(/usr/lib/cups/cgi-bin/printers.cgi
/sbin/ifconfig
/usr/bin/xpp),
($::expert ?
"/usr/share/cups/model/postscript.ppd.gz" : ())
- ))) ||
- ((!printer::files_exist((qw(/usr/bin/wget)))) &&
- (!printer::files_exist((qw(/usr/bin/curl))))))) {
+ )))) {
$in->do_pkgs->install(('cups', 'net-tools', 'xpp',
- 'webfetch',
($::expert ? 'cups-drivers' : ())));
}
+ if ((!$::testing) &&
+ ((!printer::files_exist((qw(/usr/bin/wget)))) &&
+ (!printer::files_exist((qw(/usr/bin/curl)))))) {
+ $in->do_pkgs->install
+ ($::isInstall ? 'curl' : 'webfetch');
+ }
# Try to start the network when CUPS is the spooler, so that
# remote CUPS printers get displayed (especially during
# installation)