summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-04-13 10:10:08 +0000
committerFrancois Pons <fpons@mandriva.com>2001-04-13 10:10:08 +0000
commited63b17af86c3d58e819f31b49c82a08828d4c95 (patch)
tree7ef92cdb787ccf6205994a894f766f981cb70bc6
parent5fc632de6b56e66c0ee667a274daf31d8c29d6b2 (diff)
downloaddrakx-ed63b17af86c3d58e819f31b49c82a08828d4c95.tar
drakx-ed63b17af86c3d58e819f31b49c82a08828d4c95.tar.gz
drakx-ed63b17af86c3d58e819f31b49c82a08828d4c95.tar.bz2
drakx-ed63b17af86c3d58e819f31b49c82a08828d4c95.tar.xz
drakx-ed63b17af86c3d58e819f31b49c82a08828d4c95.zip
make sure update-menus is called after installing cups related packages.
-rw-r--r--perl-install/install_steps_interactive.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index fdc023164..64ded482c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -869,8 +869,13 @@ sub configurePrinter {
$printer->{PAPERSIZE} = $o->{lang} eq 'en' ? 'letter' : 'a4';
printerdrake::main($printer, $o, $ask_multiple_printer,
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($o->{packages}, 'cups'));
+
+ if (!is_empty_hash_ref($printer->{configured}) || pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'cups'))) {
+ $o->pkg_install_if_requires_satisfied('Mesa-common', 'xpp', 'libqtcups2', 'qtcups', 'kups') ;
+
+ #- call update-menus at the end of these package installation, as some menu entries may have been added.
+ run_program::rooted($o->{prefix}, "update-menus");
+ }
}
#------------------------------------------------------------------------------