summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2006-04-11 16:50:14 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2006-04-11 16:50:14 +0000
commitbca85dbda1f2d91ea730f475345af671492c0dae (patch)
treeab4edfce89cd474f8e9df44c3173dae8cbe180a8
parent1ae615f89db7e444a996e012c3793e362946cf15 (diff)
downloadmgaonline-bca85dbda1f2d91ea730f475345af671492c0dae.tar
mgaonline-bca85dbda1f2d91ea730f475345af671492c0dae.tar.gz
mgaonline-bca85dbda1f2d91ea730f475345af671492c0dae.tar.bz2
mgaonline-bca85dbda1f2d91ea730f475345af671492c0dae.tar.xz
mgaonline-bca85dbda1f2d91ea730f475345af671492c0dae.zip
(install_pkgs) ensure we only display one window while installing a bundle
-rwxr-xr-xmdkupdate3
1 files changed, 2 insertions, 1 deletions
diff --git a/mdkupdate b/mdkupdate
index 3d24e7a2..b3a0754d 100755
--- a/mdkupdate
+++ b/mdkupdate
@@ -216,6 +216,7 @@ You need to update to a newer version. You can get a new one from http://start.m
$bundle =~ s/-[^-]*-[^-]*\.[^.]*\.rpm$//;
push @bundles, $bundle;
my %mirrors = add_mirrors($in, $w, $mirrors, \%bundle_vars);
+ undef $w;
install_pkgs($in, \@bundles, (find { /^bundle/ } keys %mirrors),
{ is_bundle => 1,
auto_select => ($bundle_vars{POST} =~ /AUTO_SELECT/ ? 1 : 0),
@@ -279,7 +280,7 @@ sub ask_pkgs {
sub install_pkgs {
my ($in, $choosed, $media_name, $o_options) = @_;
$o_options ||= {};
- my $w = $in->wait_message(N("Please wait"), N("Installing packages ...\n"));
+ my $w = $in->wait_message(N("Please wait"), N("Installing packages ...\n")) if !$o_options->{is_bundle};
my $program = $o_options->{no_X} ? '/usr/sbin/urpmi' : '/usr/bin/gurpmi';
eval {
if (!$o_options->{is_bundle}) {