diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-04-06 13:08:11 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-04-06 13:08:11 +0000 |
| commit | 45824fec5baaefad5e1d29b408f856df45ee898b (patch) | |
| tree | 5d4ca85a16867dfb065e8e2b42e6065f4938b529 | |
| parent | 0247811b0113fb849af34fa639a7cadf6edd7407 (diff) | |
| download | drakx-45824fec5baaefad5e1d29b408f856df45ee898b.tar drakx-45824fec5baaefad5e1d29b408f856df45ee898b.tar.gz drakx-45824fec5baaefad5e1d29b408f856df45ee898b.tar.bz2 drakx-45824fec5baaefad5e1d29b408f856df45ee898b.tar.xz drakx-45824fec5baaefad5e1d29b408f856df45ee898b.zip | |
fixed "No printer" after configuring cups for remove server.
added log for CD medium chosen par user.
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 902fd4057..b2de9912b 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -657,6 +657,7 @@ If only some CDs are missing, unselect them, then click Ok."), foreach (@mediums) { my $descr = pkgs::mediumDescr($packages, $_); $packages->{mediums}{$_}{selected} = $mediumsDescr{$descr}; + log::l("select status of medium $_ is $packages->{mediums}{$_}{selected}"); } } @@ -795,7 +796,10 @@ sub summary { #- format printer description in a better way according to CUPS/LPR used. my $format_printers = sub { my ($printer) = @_; - is_empty_hash_ref($printer->{configured}) and return _("No printer"); + if (is_empty_hash_ref($printer->{configured})) { + pkgs::packageFlagInstalled(pkgs::packageByName($packages, 'cups')) and return _("Remote CUPS server"); + return _("No printer"); + } my $entry = $printer->{configured}{$printer->{QUEUE}} || (values %{$printer->{configured}})[0]; for ($entry->{mode}) { /CUPS/ and return $entry->{cupsDescr}; @@ -860,8 +864,8 @@ sub configurePrinter { $printer->{PAPERSIZE} = $o->{lang} eq 'en' ? 'letter' : 'a4'; printerdrake::main($printer, $o, sub { $o->pkg_install(@_) }, sub { install_interactive::upNetwork($o, 'pppAvoided') }); - - $o->pkg_install_if_requires_satisfied('Mesa-common', 'xpp', 'libqtcups2', 'qtcups', 'kups') if !is_empty_hash_ref($printer->{configured}); + + $o->pkg_install_if_requires_satisfied('Mesa-common', 'xpp', 'libqtcups2', 'qtcups', 'kups') if !is_empty_hash_ref($printer->{configured}) || pkgs::packageFlagInstalled(pkgs::packageByName($packages, 'cups')); } #------------------------------------------------------------------------------ |