diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-02-22 19:24:42 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-02-22 19:24:42 +0000 |
| commit | 0ea15dea337d57634fc311b0a97aeb7c129d556b (patch) | |
| tree | 8ec847deca3cb8e986b3b9bbb43f18d8556730e4 | |
| parent | 954ffa5cb2ffbb169c3a852930f0419d2681c98b (diff) | |
| download | perl-URPM-0ea15dea337d57634fc311b0a97aeb7c129d556b.tar perl-URPM-0ea15dea337d57634fc311b0a97aeb7c129d556b.tar.gz perl-URPM-0ea15dea337d57634fc311b0a97aeb7c129d556b.tar.bz2 perl-URPM-0ea15dea337d57634fc311b0a97aeb7c129d556b.tar.xz perl-URPM-0ea15dea337d57634fc311b0a97aeb7c129d556b.zip | |
(_find_packages_obsoleting) fix for a rare unreproductable crash (mga#4425)
(backported from trunk)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -1,5 +1,6 @@ - fix computing size of added/freed disk space when updating involves removing some packages (mga#4427) +- fix for a rare crash (mga#4425) - 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 1af04a4..78df3b3 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -1227,6 +1227,7 @@ sub _find_packages_obsoleting { my ($urpm, $state, $p) = @_; grep { + $_ && !$_->flag_skip && $_->is_arch_compat && !exists $state->{rejected}{$_->fullname} |