diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-12-14 16:42:04 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-12-14 16:47:12 +0100 |
| commit | 1b0aaf551631c1f9c997100b61d674abf7aead75 (patch) | |
| tree | 95b8d953857166374c20bb18dbcb29cc7356190f | |
| parent | 7f355061d849f449442201c8d111eb60920d634e (diff) | |
| download | drakx-1b0aaf551631c1f9c997100b61d674abf7aead75.tar drakx-1b0aaf551631c1f9c997100b61d674abf7aead75.tar.gz drakx-1b0aaf551631c1f9c997100b61d674abf7aead75.tar.bz2 drakx-1b0aaf551631c1f9c997100b61d674abf7aead75.tar.xz drakx-1b0aaf551631c1f9c997100b61d674abf7aead75.zip | |
revert forcing $progress_total & $ratio to be int64
it's bogus as then, when not using native int64 (eg: i586), the ratio
cannot be a float between 0 & 1 and thus the progress bar can never be
updated (mga#19930)
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 9f6203764..61f367f3f 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -597,7 +597,7 @@ sub installPackages { gtknew('Image', file_ref => \$advertising_image, show_ref => \$show_advertising), ])); - my $progress_total = int64(0); + my $progress_total = 0; $box->pack_end(gtkshow(gtknew('VBox', border_width => 7, spacing => 3, children_loose => [ gtknew('ScrolledWindow', child => $pkg_log_widget, hide_ref => \$show_advertising, height => 250, to_bottom => 1), @@ -656,9 +656,9 @@ sub installPackages { my $dtime = time() - $o->{install_start_time}; my $ratio = - $total_size == 0 ? int64(0) : + $total_size == 0 ? 0 : install::pkgs::size2time($current_total_size + $amount, $total_size) / install::pkgs::size2time($total_size, $total_size); - $ratio >= 1 and $ratio = int64(1); + $ratio >= 1 and $ratio = 1; my $total_time = $ratio ? $dtime / $ratio : time(); gtkval_modify(\$progress_total, $ratio); |