summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-07 14:41:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-07 14:41:46 +0000
commit057cd219ea373e1766e1e40550ad52be28ad20c0 (patch)
treecb10855b725b013d3ff64bce1e0d73786909c99b
parentbdce4328d7679af4d5e7f00e858b17f58cec5b40 (diff)
downloaddrakx-backup-do-not-use-057cd219ea373e1766e1e40550ad52be28ad20c0.tar
drakx-backup-do-not-use-057cd219ea373e1766e1e40550ad52be28ad20c0.tar.gz
drakx-backup-do-not-use-057cd219ea373e1766e1e40550ad52be28ad20c0.tar.bz2
drakx-backup-do-not-use-057cd219ea373e1766e1e40550ad52be28ad20c0.tar.xz
drakx-backup-do-not-use-057cd219ea373e1766e1e40550ad52be28ad20c0.zip
(installPackages): don't take into account the time when prompting the user
-rw-r--r--perl-install/install_steps_gtk.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index b9755b3aa..c76d93489 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -532,7 +532,8 @@ sub installPackages {
local $my_gtk::grab = 1;
my $name = pkgs::mediumDescr($o->{packages}, $medium);
print "\a";
- $name !~ /Application/ || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX(_("
+ my $time = time();
+ my $r = $name !~ /Application/ || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX(_("
Warning
Please read carefully the terms below. If you disagree with any
@@ -560,10 +561,14 @@ documentation is usually forbidden.
All rights to the components of the next CD media belong to their
respective authors and are protected by intellectual property and
copyright laws applicable to software programs.
-")), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept") and $o->ask_okcancel('', _("Change your Cd-Rom!
+")), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept");
+ $r &&= $o->ask_okcancel('', _("Change your Cd-Rom!
Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.
If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $name));
+ #- add the elapsed time (otherwise the predicted time will be rubbish)
+ $start_time += time() - $time;
+ $r;
};
};
catch_cdie { $o->install_steps::installPackages($packages); }