summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-04-13 11:57:53 +0000
committerFrancois Pons <fpons@mandriva.com>2001-04-13 11:57:53 +0000
commitf9974510298070fc169b3a7a1874009dd2fbf62f (patch)
treebce6753d6d09e4f9c6567377c6bb352568a03df4
parent48bc14536b460c09bd2ee1566a9fb83de64910ac (diff)
downloaddrakx-f9974510298070fc169b3a7a1874009dd2fbf62f.tar
drakx-f9974510298070fc169b3a7a1874009dd2fbf62f.tar.gz
drakx-f9974510298070fc169b3a7a1874009dd2fbf62f.tar.bz2
drakx-f9974510298070fc169b3a7a1874009dd2fbf62f.tar.xz
drakx-f9974510298070fc169b3a7a1874009dd2fbf62f.zip
added conditional update-menus if package are installed.
-rw-r--r--perl-install/install_steps.pm1
-rw-r--r--perl-install/install_steps_gtk.pm4
-rw-r--r--perl-install/install_steps_interactive.pm6
3 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 83dbf3d61..59ee51fac 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -374,6 +374,7 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
run_program::rooted_or_die($o->{prefix}, 'ldconfig') unless $::g_auto_install;
log::l("Install took: ", formatTimeRaw(time - $time));
install_any::log_sizes($o);
+ scalar(@toInstall); #- return number of packages installed.
}
sub afterInstallPackages($) {
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 3d3808155..4dce16d39 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -685,7 +685,8 @@ If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $na
$r;
};
};
- catch_cdie { $o->install_steps::installPackages($packages); }
+ my $install_result;
+ catch_cdie { $install_result = $o->install_steps::installPackages($packages); }
sub {
if ($@ =~ /^error ordering package list: (.*)/) {
$o->ask_yesorno('', [
@@ -703,6 +704,7 @@ _("There was an error installing packages:"), $1, _("Go on anyway?") ], 1) and r
die "setstep choosePackages\n";
}
$w->destroy;
+ $install_result;
}
sub set_help {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 64ded482c..e96c4b825 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -871,10 +871,8 @@ sub configurePrinter {
sub { $o->pkg_install(@_) }, sub { install_interactive::upNetwork($o, 'pppAvoided') });
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");
+ $o->pkg_install_if_requires_satisfied('Mesa-common', 'xpp', 'libqtcups2', 'qtcups', 'kups')
+ and run_program::rooted($o->{prefix}, "update-menus");
}
}