diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2024-05-27 22:58:56 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2024-05-27 22:58:56 +0200 |
| commit | b55af1b05f05415af8fd6440534b11cc7e37101e (patch) | |
| tree | bb2a90605e472a342235f9a1702f4b71d3f91ba0 /URPM | |
| parent | ba2a6e3acc57d3fcb1404e73dd9a776ac5e661cc (diff) | |
| download | perl-URPM-b55af1b05f05415af8fd6440534b11cc7e37101e.tar perl-URPM-b55af1b05f05415af8fd6440534b11cc7e37101e.tar.gz perl-URPM-b55af1b05f05415af8fd6440534b11cc7e37101e.tar.bz2 perl-URPM-b55af1b05f05415af8fd6440534b11cc7e37101e.tar.xz perl-URPM-b55af1b05f05415af8fd6440534b11cc7e37101e.zip | |
Handle i586 -> i686 upgrade
Diffstat (limited to 'URPM')
| -rw-r--r-- | URPM/Resolve.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index dde3159..b0ab7ec 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -176,7 +176,7 @@ sub strict_arch_check_installed { my $n = $pkg->name; defined $installed_arch{$n} or $installed_arch{$n} = get_installed_arch($db, $n); if ($installed_arch{$n} && $installed_arch{$n} ne 'noarch') { - $arch eq $installed_arch{$n} or return; + $arch eq $installed_arch{$n} or $arch =~ /^i.86/ && $installed_arch{$n} =~ /^i.86/ or return; } } 1; @@ -196,7 +196,7 @@ sub strict_arch_check { if ($arch ne 'src' && $arch ne 'noarch') { my $inst_arch = $installed_pkg->arch; if ($inst_arch ne 'noarch') { - $arch eq $inst_arch or return; + $arch eq $inst_arch or $arch =~ /^i.86/ && $inst_arch=~ /^i.86/ or return; } } 1; |