diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2003-02-25 15:32:13 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2003-02-25 15:32:13 +0000 |
| commit | e2cbe9ff75842ecf47d9bff9c01edc3a9a4b5f1d (patch) | |
| tree | 0cc3bef92efbdef1770395af7510e65f1bc7b0c7 /perl-install | |
| parent | 81c43938c0cee5709189cf5c8def6d79a5057337 (diff) | |
| download | drakx-e2cbe9ff75842ecf47d9bff9c01edc3a9a4b5f1d.tar drakx-e2cbe9ff75842ecf47d9bff9c01edc3a9a4b5f1d.tar.gz drakx-e2cbe9ff75842ecf47d9bff9c01edc3a9a4b5f1d.tar.bz2 drakx-e2cbe9ff75842ecf47d9bff9c01edc3a9a4b5f1d.tar.xz drakx-e2cbe9ff75842ecf47d9bff9c01edc3a9a4b5f1d.zip | |
Prepared for LPRng and PDQ goint to Contribs or leaving the distro, "Change
Printing System" button only appears if at least one of them is manually
installed.
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/printer/main.pm | 8 | ||||
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm index 996b4730d..cd56f0aae 100644 --- a/perl-install/printer/main.pm +++ b/perl-install/printer/main.pm @@ -54,7 +54,13 @@ sub spooler { # LPRng is not officially supported any more since Mandrake 9.0, so # show it only in the spooler menu when it was manually installed. - return map { $spoolers{$_}{long_name} } qw(cups pdq), if_(files_exist(qw(/usr/lib/filters/lpf /usr/sbin/lpd)), 'lprng'); + + # PDQ is not officially supported any more since Mandrake 9.1, so + # show it only in the spooler menu when it was manually installed. + + return map { $spoolers{$_}{long_name} } qw(cups), + if_(files_exist(qw(/usr/bin/pdq)), 'pdq'), + if_(files_exist(qw(/usr/lib/filters/lpf /usr/sbin/lpd)), 'lprng'); } sub printer_type($) { diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 77607404e..a03111d90 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -3646,7 +3646,10 @@ sub main { }, val => ($::expert ? N("CUPS configuration") : N("Printer sharing")) }) : ()), - ($::expert ? + ($::expert && + (files_exist(qw(/usr/bin/pdq)) || + files_exist(qw(/usr/lib/filters/lpf + /usr/sbin/lpd))) ? { clicked_may_quit => sub { # Save the cursor position |