From 87cfb5bdad5e80eb98c924749c3ad03e40e6b794 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Fri, 4 Mar 2005 17:09:23 +0000
Subject: - Let printerdrake recognize if the user edited /etc/cups/client.conf
   manually.

---
 perl-install/printer/default.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install/printer/default.pm')

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/;
     }
 }
 
-- 
cgit v1.2.1