summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-10 15:37:05 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-10 15:37:05 +0000
commit1dc1d2f64dd1bf00dd1389a3c71a0e614223a9d5 (patch)
tree8429578d7ad65f770df4192ee91f2ce230e84f3f
parent9ed3ca2268fdf6b0f1224c54e9049b45f97a7a88 (diff)
downloaddrakx-1dc1d2f64dd1bf00dd1389a3c71a0e614223a9d5.tar
drakx-1dc1d2f64dd1bf00dd1389a3c71a0e614223a9d5.tar.gz
drakx-1dc1d2f64dd1bf00dd1389a3c71a0e614223a9d5.tar.bz2
drakx-1dc1d2f64dd1bf00dd1389a3c71a0e614223a9d5.tar.xz
drakx-1dc1d2f64dd1bf00dd1389a3c71a0e614223a9d5.zip
Put a wait message for copying rpms from CDs
-rw-r--r--perl-install/install_any.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 5cf994aee..c6a17b7eb 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -643,7 +643,9 @@ Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.",
my $total = $o->{mediumsize};
log::l("totalsize=$total");
my $pid;
- if (!method_allows_medium_change($o->{method}) || $o->{method} =~ /-iso$/) {
+ #- will we show a progress bar?
+ my $copy_has_progress_bar = !method_allows_medium_change($o->{method}) || $o->{method} =~ /-iso$/;
+ if ($copy_has_progress_bar) {
#- display the progress bar only for non-cdrom installation methods
$pid = fork();
if (!$pid && defined $pid) { #- child
@@ -677,9 +679,12 @@ Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.",
$current_medium = $k;
}
log::l("copying /tmp/image/$m->{rpmsdir} to $o->{prefix}/var/ftp/pub/Mandrakelinux/media");
+ my $wait_w;
+ unless ($copy_has_progress_bar) { $wait_w = $o->wait_message(N("Please wait"), N("Copying in progress")) }
eval {
cp_af("/tmp/image/$m->{rpmsdir}", "$o->{prefix}/var/ftp/pub/Mandrakelinux/media");
};
+ undef $wait_w;
log::l($@) if $@;
$m->{prefix} = "$o->{prefix}/var/ftp/pub/Mandrakelinux";
$m->{method} = 'disk';