diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-02-22 19:24:32 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-02-22 19:24:32 +0000 |
| commit | 17abf77cb6267459c5a2994bac333691b84462af (patch) | |
| tree | 04bb9c2d842a3042e9cbd6d8291daa9a8b4c1bcc | |
| parent | 0aec00b1fb8246ef5e41668783891e2ebca28e98 (diff) | |
| download | perl-URPM-17abf77cb6267459c5a2994bac333691b84462af.tar perl-URPM-17abf77cb6267459c5a2994bac333691b84462af.tar.gz perl-URPM-17abf77cb6267459c5a2994bac333691b84462af.tar.bz2 perl-URPM-17abf77cb6267459c5a2994bac333691b84462af.tar.xz perl-URPM-17abf77cb6267459c5a2994bac333691b84462af.zip | |
(_selected_size_filesize) fix computing size of added/freed disk space
when updating involves removing some packages (mga#4427)
(bug introduced by fpons in r11176 on Jun 26 2003 ("0.91-7mdk"))
(backported from trunk)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 6 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- fix computing size of added/freed disk space when updating involves removing + some packages (mga#4427) - fix slow matching of individual regexes for skipping dependencies by creating a large regex to match them all at once (mdv#61389, Shlomi Fish) - really prefer packages from first media, thus fixing downloading noarch diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 5404cc0..1af04a4 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -1540,7 +1540,11 @@ sub _selected_size_filesize { foreach (values %{$state->{rejected} || {}}) { $_->{removed} || $_->{obsoleted} or next; - $size -= $_->{size}; + if ($_->{size} < 0) { + $size += $_->{size}; + } else { + $size -= $_->{size}; + } } foreach (@{$state->{orphans_to_remove} || []}) { |