diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2003-03-02 23:18:41 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2003-03-02 23:18:41 +0000 |
| commit | 5f962ece633c366005bf8b270adce97c1bea2771 (patch) | |
| tree | 128c21077d87fa5edd90fef15a6e067615bf7122 /perl-install/printer | |
| parent | 1a7a3beb5f10554b525deb88fbc78f75473dd9b0 (diff) | |
| download | drakx-backup-do-not-use-5f962ece633c366005bf8b270adce97c1bea2771.tar drakx-backup-do-not-use-5f962ece633c366005bf8b270adce97c1bea2771.tar.gz drakx-backup-do-not-use-5f962ece633c366005bf8b270adce97c1bea2771.tar.bz2 drakx-backup-do-not-use-5f962ece633c366005bf8b270adce97c1bea2771.tar.xz drakx-backup-do-not-use-5f962ece633c366005bf8b270adce97c1bea2771.zip | |
Make file checks for CUPS package installation independent of whether "curl"
or "wget" is installed to fulfill the "webfetch" requirement.
Diffstat (limited to 'perl-install/printer')
| -rw-r--r-- | perl-install/printer/data.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm index 4985cadc4..3e21e4478 100644 --- a/perl-install/printer/data.pm +++ b/perl-install/printer/data.pm @@ -82,7 +82,10 @@ our %spoolers = ('pdq' => { /sbin/ifconfig /usr/bin/xpp /usr/share/cups/model/postscript.ppd.gz), - $::isInstall ? '/usr/bin/curl' : '/usr/bin/wget' ] ], + $::isInstall || + !(-x '/usr/bin/wget') ? + '/usr/bin/curl' : + '/usr/bin/wget' ] ], 'alternatives' => [ [ 'lpr', '/usr/bin/lpr-cups' ], [ 'lpq', '/usr/bin/lpq-cups' ], |