summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-04-06 13:17:27 +0000
committerFrancois Pons <fpons@mandriva.com>2001-04-06 13:17:27 +0000
commit9a097e4618b7bc3cf644f431ed9e99441a83ff2f (patch)
tree313b74b59a0c084ae157add225ba808cae8d98b3
parentba49c648d57ae9a0a4067a42566a142bfd9026ef (diff)
downloaddrakx-9a097e4618b7bc3cf644f431ed9e99441a83ff2f.tar
drakx-9a097e4618b7bc3cf644f431ed9e99441a83ff2f.tar.gz
drakx-9a097e4618b7bc3cf644f431ed9e99441a83ff2f.tar.bz2
drakx-9a097e4618b7bc3cf644f431ed9e99441a83ff2f.tar.xz
drakx-9a097e4618b7bc3cf644f431ed9e99441a83ff2f.zip
fixed typo for cups checking of installation.
-rw-r--r--perl-install/install_steps_interactive.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index b2de9912b..2fbda0d9a 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -797,7 +797,7 @@ sub summary {
my $format_printers = sub {
my ($printer) = @_;
if (is_empty_hash_ref($printer->{configured})) {
- pkgs::packageFlagInstalled(pkgs::packageByName($packages, 'cups')) and return _("Remote CUPS server");
+ pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'cups')) and return _("Remote CUPS server");
return _("No printer");
}
my $entry = $printer->{configured}{$printer->{QUEUE}} || (values %{$printer->{configured}})[0];
@@ -865,7 +865,7 @@ 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}) || pkgs::packageFlagInstalled(pkgs::packageByName($packages, 'cups'));
+ $o->pkg_install_if_requires_satisfied('Mesa-common', 'xpp', 'libqtcups2', 'qtcups', 'kups') if !is_empty_hash_ref($printer->{configured}) || pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'cups'));
}
#------------------------------------------------------------------------------