From e24fb32ac9044de096ed96ebcb9d5798ff350ca2 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 13 Aug 2002 14:21:53 +0000
Subject: allow selecting a choice package according to locales-xx found.

---
 perl-install/pkgs.pm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'perl-install/pkgs.pm')

diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 4dce1e796..7e79a8ca6 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -207,9 +207,18 @@ sub packageRequest {
 sub packageCallbackChoices {
     my ($urpm, $db, $state, $choices) = @_;
     my $prefer;
-    foreach (@$choices) {
-	exists $preferred{$_->name} and $prefer = $_;
-	$_->name =~ /kernel-\d/ and $prefer ||= $_;
+    foreach my $pkg (@$choices) {
+	#- examine first an explicitely prefered package.
+	exists $preferred{$pkg->name} and $prefer = $pkg;
+	#- or if a kernel has to be chosen, chose the basic one.
+	$pkg->name =~ /kernel-\d/ and $prefer ||= $pkg;
+	#- or even if a package requires a specific locales which
+	#- is already selected.
+	foreach ($pkg->requires_nosense) {
+	    /locales-/ or next;
+	    my $p = packageByName($packages, $_) or next;
+	    $p->flag_available and $prefer ||= $pkg;
+	}
     }
     $prefer || $choices->[0]; #- first one (for instance).
 }
-- 
cgit v1.2.1