diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-03-20 17:30:43 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-03-20 17:30:43 +0000 |
| commit | a4f074053b427ccf03f4734e7b84239ddf321c53 (patch) | |
| tree | 097b4f3e8c50ff145df101a7063439f193c4036e /perl-install/printer.pm | |
| parent | 3361881c18f5ed507c688244ba61e32fe7e57486 (diff) | |
| download | drakx-a4f074053b427ccf03f4734e7b84239ddf321c53.tar drakx-a4f074053b427ccf03f4734e7b84239ddf321c53.tar.gz drakx-a4f074053b427ccf03f4734e7b84239ddf321c53.tar.bz2 drakx-a4f074053b427ccf03f4734e7b84239ddf321c53.tar.xz drakx-a4f074053b427ccf03f4734e7b84239ddf321c53.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/printer.pm')
| -rw-r--r-- | perl-install/printer.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm index 68127f0ff..34a20336d 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -337,9 +337,10 @@ sub read_printer_db(;$) { @available_devices{split /\s+/, $_} = () if /^\s+/; } } + close AVAIL; + $available_devices{ppa} = undef if -x "$prefix/usr/bin/pbm2ppa" && -x "$prefix/usr/bin/pnm2ppa"; delete $available_devices{''}; @available_devices{qw/POSTSCRIPT TEXT/} = (); #- these are always available. - close AVAIL; local $_; #- use of while (<... local *DBPATH; #- don't have to do close ... and don't modify globals at least @@ -589,8 +590,8 @@ sub configure_queue($) { #- make general.cfg ($filein, $file) = &$get_name_file("general.cfg"); - $fieldname{ascps_trans} = $entry->{ASCII_TO_PS} ? "YES" : "NO"; - $fieldname{desiredto} = ($dbentry->{GSDRIVER} ne "TEXT") ? "ps" : "asc"; + $fieldname{ascps_trans} = $entry->{ASCII_TO_PS} || $dbentry->{GSDRIVER} eq 'ppa' ? "YES" : "NO"; + $fieldname{desiredto} = $dbentry->{GSDRIVER} ne "TEXT" ? "ps" : "asc"; $fieldname{papersize} = $entry->{PAPERSIZE} ? $entry->{PAPERSIZE} : "letter"; $fieldname{printertype} = $entry->{TYPE}; create_config_file($filein, $file, %fieldname); |