From 5ac101a075536b1f6ceea2a335423c18b2ca2269 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 17 Dec 2018 16:14:23 +0000
Subject: installer: support optional ISA requirement when selecting packages
 by name.

Needed for next commit.
---
 perl-install/install/pkgs.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index ee3c83b54..91a57c2cf 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -125,13 +125,14 @@ sub packagesProviding {
     grep { $_->is_arch_compat } URPM::packages_providing($packages, $name);
 }
 
-#- search package with given name and compatible with current architecture.
+#- search package with given name (and optional ISA) and compatible with current architecture.
 #- take the best one found (most up-to-date).
 # FIXME: reuse urpmi higher level code instead!
 sub packageByName {
     my ($packages, $name) = @_;
 
-    my @l =  sort { $b->id <=> $a->id } grep { $_->name eq $name } packagesProviding($packages, $name);
+    my $basename = $name =~ s/\(x86-..\)$//r;
+    my @l = sort { $b->id <=> $a->id } grep { $_->name eq $basename } packagesProviding($packages, $name);
 
     my $best;
     foreach (@l) {
-- 
cgit v1.2.1