summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-03-04 17:09:23 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-03-04 17:09:23 +0000
commit87cfb5bdad5e80eb98c924749c3ad03e40e6b794 (patch)
tree1da3771dec0b4ca63cc076a8aaeeeb9a280ecba9
parent5d275823289f5c2ab6417c31a9f1030a8ca4b021 (diff)
downloaddrakx-backup-do-not-use-87cfb5bdad5e80eb98c924749c3ad03e40e6b794.tar
drakx-backup-do-not-use-87cfb5bdad5e80eb98c924749c3ad03e40e6b794.tar.gz
drakx-backup-do-not-use-87cfb5bdad5e80eb98c924749c3ad03e40e6b794.tar.bz2
drakx-backup-do-not-use-87cfb5bdad5e80eb98c924749c3ad03e40e6b794.tar.xz
drakx-backup-do-not-use-87cfb5bdad5e80eb98c924749c3ad03e40e6b794.zip
- Let printerdrake recognize if the user edited /etc/cups/client.conf
manually.
-rw-r--r--perl-install/printer/default.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/printer/default.pm b/perl-install/printer/default.pm
index b6f45c889..a6e64c30d 100644
--- a/perl-install/printer/default.pm
+++ b/perl-install/printer/default.pm
@@ -41,7 +41,12 @@ sub get_spooler () {
if (-f "$::prefix$FOOMATIC_DEFAULT_SPOOLER") {
my $spool = cat_("$::prefix$FOOMATIC_DEFAULT_SPOOLER");
chomp $spool;
- return $spool if $spool =~ /cups|lpd|lprng|pdq/;
+ if ($spool =~ /cups/) {
+ my ($daemonless_cups, $_remote_cups_server) =
+ printer::main::read_client_conf();
+ $spool = ($daemonless_cups > 0 ? "rcups" : "cups");
+ }
+ return $spool if $spool =~ /cups|lpd|lprng|pdq/;
}
}