From 90d04f26bdac5ab733fe41b087b0c1b279122714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= <peroyvind@mandriva.org>
Date: Thu, 12 May 2011 15:45:32 +0000
Subject: 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/)

---
 NEWS            |  5 +++++
 URPM.pm         |  2 +-
 URPM/Resolve.pm | 16 +++++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index d9885bd..dd8afb1 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/URPM.pm b/URPM.pm
index 30aaf2f..df9efd6 100644
--- a/URPM.pm
+++ b/URPM.pm
@@ -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,
-- 
cgit v1.2.1