summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-01-12 05:57:32 +0000
committerFrancois Pons <fpons@mandriva.com>2000-01-12 05:57:32 +0000
commit0dc2fe26d5665567afc0e5f2187e7d6ae41ce0dd (patch)
tree48117c489d683302a17daa37bfc0661e68a660ea /perl-install
parentefe4d482264afc4df49addf731316c1f4c93b6dc (diff)
downloaddrakx-0dc2fe26d5665567afc0e5f2187e7d6ae41ce0dd.tar
drakx-0dc2fe26d5665567afc0e5f2187e7d6ae41ce0dd.tar.gz
drakx-0dc2fe26d5665567afc0e5f2187e7d6ae41ce0dd.tar.bz2
drakx-0dc2fe26d5665567afc0e5f2187e7d6ae41ce0dd.tar.xz
drakx-0dc2fe26d5665567afc0e5f2187e7d6ae41ce0dd.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/printer.pm2
-rw-r--r--perl-install/printerdrake.pm6
2 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index 524a8ae0e..21098df37 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -288,6 +288,8 @@ sub read_printer_db(;$) {
}
}
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
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 19de5ba02..3b54ac994 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -197,11 +197,7 @@ wish to access and any applicable user name and password."),
my %depth_to_col = reverse %col_to_depth;
my $is_uniprint = $db_entry{GSDRIVER} eq "uniprint";
- if (@list_res) {
- $printer->{RESOLUTION} = $list_res[0];
- } else {
- $printer->{RESOLUTION} = "Default";
- }
+ $printer->{RESOLUTION} = @res ? $res[0] || "Default" : "Default";
$printer->{CRLF} = $db_entry{DESCR} =~ /HP/;
$printer->{BITSPERPIXEL} = @list_col ? $depth_to_col{$printer->{BITSPERPIXEL}} || $depth_to_col{$col[0]} : "Default";