diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-09-18 14:43:52 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-09-18 14:43:52 +0000 |
| commit | e48a0c9524961522c729203bfbb8248324aae178 (patch) | |
| tree | 7537e5ceb915792837de16282a980ab8ec990963 | |
| parent | 8f6717d7f54371a15b3bac584e1df0d6215ab864 (diff) | |
| download | drakx-backup-do-not-use-e48a0c9524961522c729203bfbb8248324aae178.tar drakx-backup-do-not-use-e48a0c9524961522c729203bfbb8248324aae178.tar.gz drakx-backup-do-not-use-e48a0c9524961522c729203bfbb8248324aae178.tar.bz2 drakx-backup-do-not-use-e48a0c9524961522c729203bfbb8248324aae178.tar.xz drakx-backup-do-not-use-e48a0c9524961522c729203bfbb8248324aae178.zip | |
fixed no printer displayed (at least, print Remote CUPS server).
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 0aae8f46e..51ccb2771 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -855,8 +855,11 @@ sub summary { pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'cups')) and return _("Remote CUPS server"); return _("No printer"); } - my $entry = $printer->{configured}{currentqueue} || (values %{$printer->{configured}{queuedata}})[0]; - return "$entry->{make} $entry->{model}"; + my $entry; + foreach ($printer->{configured}{currentqueue}, values %{$printer->{configured}{queuedata}}) { + $_ && ($_->{make} || $_->{model}) and return "$_->{make} $_->{model}"; + } + return _("Remote CUPS server"); #- fall back in case of something wrong. }; $o->ask_from_({ |