From 4920fbf71ee20c8cfd44fa6a73c06f2159932cff Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Sep 2017 20:24:35 +0200 Subject: adapt to URPM-5.14 (using perl native ints) See mga#21441 --- perl-install/install/pkgs.pm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'perl-install/install/pkgs.pm') diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index b83655401..3317f0fbe 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -2,7 +2,6 @@ package install::pkgs; use strict; use feature 'state'; -use Math::Int64 ':native_if_available', 'int64'; BEGIN { # needed before "use URPM" @@ -47,7 +46,7 @@ sub invCorrectSize { ($_[0] * $D - $C) / $B } sub selectedSize { my ($packages) = @_; - my $size = int64(0); + my $size = 0; my %skip; #- take care of packages selected... foreach (@{$packages->{depslist}}) { @@ -69,12 +68,8 @@ sub selectedSize { $size; } -sub int64_to_float { sprintf("%.2f", $_[0])*1 } - sub size2time { my ($x, $max) = @_; - $x = int64_to_float($x); - $max = int64_to_float($max); my $A = 7e9; my $limit = min($max * 3 / 4, 9e8); if ($x < $limit) { @@ -732,7 +727,7 @@ sub selectPackagesAlreadyInstalled { my %sizes; $packages->{rpmdb}->traverse(sub { my ($p) = @_; - $sizes{$p->name} ||= int64(0); + $sizes{$p->name} ||= 0; $sizes{$p->name} += $p->size; }); $packages->{sizes} = \%sizes; @@ -790,7 +785,7 @@ sub install { #- first stage to extract some important information #- about the selected packages. - my ($total, $nb) = (int64(0), 0); + my ($total, $nb) = (0, 0); foreach my $pkg (@$toInstall) { $packages{$pkg->id} = $pkg; $nb++; -- cgit v1.2.1