callback_choices: when a choice has to be made involving locales,

autochoose the package requiring the locales already installed on
the machine, or the package requiring an already selected locale

1 files changed, 12 insertions, 0 deletions

diff --git a/rpmdrake b/rpmdrake
index e16c25ed..689d72e4 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -197,6 +197,18 @@ sub run_treeview_dialog {
     my $formatlistpkg = sub { myformatList(sort { uc($a) cmp uc($b) } @_) };
     my $callback_choices = sub {
 	my ($urpm, $db, $state, $choices) = @_;
+	foreach my $pkg (@$choices) {
+	    foreach ($pkg->requires_nosense) {
+		/locales-/ or next;
+		foreach (keys %{$urpm->{provides}{$_} || {}}) {
+		    $urpm->{depslist}[$_]->flag_selected or next;
+		    return $pkg;
+		}
+		my $autochoice;
+		db->traverse_tag('name', [ $_ ], sub { $autochoice ||= $pkg });
+		$autochoice and return $autochoice;
+	    }
+	}
 	$choices->[interactive_list(_("Please choose"), _("One of the following packages is needed:"), map { my_fullname($_) } @$choices)];
     };
     my $choices_auto;