summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/default.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2004-08-27 18:19:38 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2004-08-27 18:19:38 +0000
commit115642e472a721aee88a1ba7e4884c8de4799fac (patch)
tree00c9f3d4bd275be39c925fb908af127479ef6ca3 /perl-install/printer/default.pm
parentbf4f9fc6e28a877fc9bd0640d31e0af73120f869 (diff)
downloaddrakx-115642e472a721aee88a1ba7e4884c8de4799fac.tar
drakx-115642e472a721aee88a1ba7e4884c8de4799fac.tar.gz
drakx-115642e472a721aee88a1ba7e4884c8de4799fac.tar.bz2
drakx-115642e472a721aee88a1ba7e4884c8de4799fac.tar.xz
drakx-115642e472a721aee88a1ba7e4884c8de4799fac.zip
- Made support for daemon-less CUPS client working.
- Fixed graying out of buttons/menu entries in the main window.
Diffstat (limited to 'perl-install/printer/default.pm')
-rw-r--r--perl-install/printer/default.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/printer/default.pm b/perl-install/printer/default.pm
index af997fd48..b6f45c889 100644
--- a/perl-install/printer/default.pm
+++ b/perl-install/printer/default.pm
@@ -11,17 +11,21 @@ my $FOOMATIC_DEFAULT_SPOOLER = "$FOOMATICCONFDIR/defaultspooler";
sub set_printer {
my ($printer) = $_[0];
+ my $spooler = $printer->{SPOOLER};
+ $spooler = "cups" if $spooler eq "rcups";
run_program::rooted($::prefix, "foomatic-configure",
- "-D", "-q", "-s", $printer->{SPOOLER},
+ "-D", "-q", "-s", $spooler,
"-n", $printer->{DEFAULT}) or return 0;
return 1;
}
sub get_printer {
my $printer = $_[0];
+ my $spooler = $printer->{SPOOLER};
+ $spooler = "cups" if $spooler eq "rcups";
local *F;
open F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
- "foomatic-configure -Q -q -s $printer->{SPOOLER} |" or return undef;
+ "foomatic-configure -Q -q -s $spooler |" or return undef;
my $line;
while ($line = <F>) {
if ($line =~ m!^\s*<defaultqueue>(.*)</defaultqueue>\s*$!) {