diff options
| -rw-r--r-- | Changes | 6 | ||||
| -rw-r--r-- | Makefile.PL | 2 | ||||
| -rw-r--r-- | URPM.pm | 2 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 4 |
4 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Version 5.225 - 29 May 2022 + +- Handle i586 -> i686 upgrade + +Version 5.224 - 19 December 2022 + - Add back support for "foo > 5" syntx in property2name* Version 5.223.1 - 14 November 2022 diff --git a/Makefile.PL b/Makefile.PL index 0bcc8a7..6b4c76f 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -91,7 +91,7 @@ WriteMakefile( provides => { 'URPM' => { file => 'URPM.pm', - version => 'v5.223.1', + version => 'v5.225', }, 'URPM::Resolve' => { file => 'URPM/Resolve.pm', @@ -14,7 +14,7 @@ use URPM::Resolve; use URPM::Signature; our @ISA = qw(DynaLoader); -our $VERSION = 'v5.223.1'; +our $VERSION = 'v5.225'; URPM->bootstrap($VERSION); 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; |