diff options
| author | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2011-05-12 15:45:32 +0000 |
|---|---|---|
| committer | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2011-05-12 15:45:32 +0000 |
| commit | 90d04f26bdac5ab733fe41b087b0c1b279122714 (patch) | |
| tree | 0634fe2c34c2faf084f4d28be8884f24e4a714d1 | |
| parent | ef9929b8ef92cf4e6f8139377898e1d1474f6547 (diff) | |
| download | perl-URPM-90d04f26bdac5ab733fe41b087b0c1b279122714.tar perl-URPM-90d04f26bdac5ab733fe41b087b0c1b279122714.tar.gz perl-URPM-90d04f26bdac5ab733fe41b087b0c1b279122714.tar.bz2 perl-URPM-90d04f26bdac5ab733fe41b087b0c1b279122714.tar.xz perl-URPM-90d04f26bdac5ab733fe41b087b0c1b279122714.zip | |
new version:
o fix Resolve.pm/_choose_required() breakage after DUDF merge, causing
ie. 'urpmq -d' to break (#63250, with big thanks to Funda\o/)
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | URPM.pm | 2 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 16 |
3 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Version 4.30 . 12 May 2011, by Per Øyvind Karlsen + +- fix Resolve.pm/_choose_required() breakage after DUDF merge, causing ie. + 'urpmq -d' to break (#63250, with big thanks to Funda\o/) + Version 4.29 - 7 May 2011, by Per Øyvind Karlsen - fix segfault when trying to get EVR of a src.rpm from synthesis, as @@ -11,7 +11,7 @@ use URPM::Resolve; use URPM::Signature; our @ISA = qw(DynaLoader); -our $VERSION = '4.29'; +our $VERSION = '4.30'; URPM->bootstrap($VERSION); diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index f2e2d4f..47de216 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -410,13 +410,15 @@ sub _choose_required { my @l = grep { ref $_ } $options{callback_choices}->($urpm, $db, $state, $chosen, _dep_to_name($urpm, $dep), $prefered); $urpm->{debug_URPM}("replacing " . _dep_to_name($urpm, $dep) . " with " . join(' ', map { $_->name } @l)) if $urpm->{debug_URPM}; - push @{$urpm->{_dudf}}, { - chosen => $chosen, - prefered => $prefered, - properties => $properties, - virtualpkgname => _dep_to_name($urpm, $dep), - list => '<' . $l[0]->fullname . '>', # Ugly hack, otherwise the hash is totally fuck'd up. - }; + if (@l) { + push @{$urpm->{_dudf}}, { + chosen => $chosen, + prefered => $prefered, + properties => $properties, + virtualpkgname => _dep_to_name($urpm, $dep), + list => '<' . $l[0]->fullname . '>', # Ugly hack, otherwise the hash is totally fuck'd up. + }; + } unshift @$properties, map { +{ required => $_->id, |