summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-03-01 19:12:48 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-03-01 19:12:48 +0000
commite87980f67ac80f61700797a2da89f5b9070261df (patch)
tree4013d361e73944ff92eaf3eddfcebc3078c9cfa5
parent6ca3a29a13422ac03b06c8cdc5fc26d41b3af470 (diff)
downloaddrakx-e87980f67ac80f61700797a2da89f5b9070261df.tar
drakx-e87980f67ac80f61700797a2da89f5b9070261df.tar.gz
drakx-e87980f67ac80f61700797a2da89f5b9070261df.tar.bz2
drakx-e87980f67ac80f61700797a2da89f5b9070261df.tar.xz
drakx-e87980f67ac80f61700797a2da89f5b9070261df.zip
The generation of the "Summary" button for printer configuration created a blank entry in the $o->{printer}{configures} hash which lead to a blank menu entry in the main menu of printerdrake. This is fixed now.
-rw-r--r--perl-install/install_steps_interactive.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index b644fcb1a..692316bba 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -919,9 +919,12 @@ sub summary {
require pkgs;
my $p = pkgs::packageByName($o->{packages}, 'cups');
$p && $p->flag_installed ? N("Remote CUPS server") : N("No printer");
+ } elsif (defined($o->{printer}{configured}{$o->{printer}{DEFAULT}}) &&
+ (my $p = find { $_ && ($_->{make} || $_->{model}) }
+ $o->{printer}{configured}{$o->{printer}{DEFAULT}}{queuedata})) {
+ "$p->{make} $p->{model}";
} elsif (my $p = find { $_ && ($_->{make} || $_->{model}) }
- $o->{printer}{currentqueue},
- map { $_->{queuedata} } ($o->{printer}{configured}{$o->{printer}{DEFAULT}}, values %{$o->{printer}{configured}})) {
+ map { $_->{queuedata} } (values %{$o->{printer}{configured}})) {
"$p->{make} $p->{model}";
} else {
N("Remote CUPS server"); #- fall back in case of something wrong.