diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2006-03-29 17:30:31 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2006-03-29 17:30:31 +0000 |
commit | 00a24108685ef4afb2abeaef8bd5f7c84ef46f89 (patch) | |
tree | 70caaba61b86e099558b5002ddee8f6bd98ad2f3 | |
parent | c841d58ba876a03bf5c58ccc937f3f5683a62078 (diff) | |
download | mgaonline-00a24108685ef4afb2abeaef8bd5f7c84ef46f89.tar mgaonline-00a24108685ef4afb2abeaef8bd5f7c84ef46f89.tar.gz mgaonline-00a24108685ef4afb2abeaef8bd5f7c84ef46f89.tar.bz2 mgaonline-00a24108685ef4afb2abeaef8bd5f7c84ef46f89.tar.xz mgaonline-00a24108685ef4afb2abeaef8bd5f7c84ef46f89.zip |
display the "preparing" popup earlier so that the user had some
feedback once he has clicked on the bundle on the web page
-rwxr-xr-x | mdkupdate | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -146,6 +146,7 @@ if (!$bundle) { N("You first need to install the system on your harddrive with the 'Live Install' wizard.")); $in->exit(1); } + my $w = $in->wait_message(N("Please wait"), N("Preparing...")); my $bundle_info; my %bundle_vars = getVarsFromSh($bundle); rm_rf($bundle); @@ -166,7 +167,7 @@ You need to update to a newer version. You can get a new one from http://start.m print Data::Dumper->Dump([ $bundle_info ], [ qw(bundle_info) ]); if ($bundle_info->{status}) { my @bundles; - my $w = $in->wait_message(N("Please wait"), N("Preparing...")); + $w = $in->wait_message(N("Please wait"), N("Preparing...")); my ($mirrors, $bundle) = ($bundle_info->{data}{mirrors}, $bundle_info->{data}{bundle}); foreach my $mirror (@$mirrors) { next if $mirror->{mode} eq 'anon'; # nothing to do @@ -179,6 +180,7 @@ You need to update to a newer version. You can get a new one from http://start.m my $encoded_pass = uri_escape($bundle_vars{PASS}); $mirror->{url} =~ s!^([^:]*)://!\1://$encoded_login:$encoded_pass@!; } else { # unknown method, aborting + undef $w; log::explanations("we got a bad bundle"); $in->ask_warn(N("Error"), N("This bundle is not well formated. Aborting.")); $in->exit(1); @@ -194,6 +196,7 @@ You need to update to a newer version. You can get a new one from http://start.m medias => [ keys %mirrors ], }); } else { + undef $w; log::explanations("we did not got back a bundle: $bundle_info->{message}"); $in->ask_warn(N("Error"), N("An error occurred") . "\n\n" . $bundle_info->{message}); } |