summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2006-01-20 20:39:30 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2006-01-20 20:39:30 +0000
commitadd0b1be43bf854aaddde0e0dca2223f51eb9bd0 (patch)
treee73fa6a6902d96af4f5dcdc6dcbc4d50568e6573
parent6674469f15a90c92422def34b9e2a05cad7d7c27 (diff)
downloaddrakx-add0b1be43bf854aaddde0e0dca2223f51eb9bd0.tar
drakx-add0b1be43bf854aaddde0e0dca2223f51eb9bd0.tar.gz
drakx-add0b1be43bf854aaddde0e0dca2223f51eb9bd0.tar.bz2
drakx-add0b1be43bf854aaddde0e0dca2223f51eb9bd0.tar.xz
drakx-add0b1be43bf854aaddde0e0dca2223f51eb9bd0.zip
- Give priority to custom PPD file if printer queue record in
printerdrake is broken, use "Postscript" if Foomatic driver is wrongly set to "PPD", should fix bug #20028.
-rw-r--r--perl-install/printer/main.pm20
1 files changed, 11 insertions, 9 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index 8abd74157..2a8757f82 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -2162,15 +2162,17 @@ sub configure_queue($) {
$printer->{configured}{$printer->{OLD_QUEUE}} ?
("-C", $printer->{OLD_QUEUE}) : ()),
"-c", $quotedconnect,
- ($printer->{currentqueue}{foomatic} ?
- ("-p", $printer->{currentqueue}{printer},
- "-d", $printer->{currentqueue}{driver}) :
- ($printer->{currentqueue}{ppd} ?
- ($printer->{currentqueue}{ppd} ne '1' ?
- ("--ppd",
- ($printer->{currentqueue}{ppd} !~ m!^/! ?
- "/usr/share/cups/model/" : "") .
- $printer->{currentqueue}{ppd}) : ()) :
+ ($printer->{currentqueue}{ppd} ?
+ ($printer->{currentqueue}{ppd} ne '1' ?
+ ("--ppd",
+ ($printer->{currentqueue}{ppd} !~ m!^/! ?
+ "/usr/share/cups/model/" : "") .
+ $printer->{currentqueue}{ppd}) : ()) :
+ ($printer->{currentqueue}{foomatic} ?
+ ("-p", $printer->{currentqueue}{printer},
+ "-d",($printer->{currentqueue}{driver} ne "PPD" ?
+ $printer->{currentqueue}{driver} :
+ "Postscript")) :
("-d", "raw"))),
"-N", $printer->{currentqueue}{desc},
"-L", $printer->{currentqueue}{loc},