diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2021-10-23 10:35:22 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2021-10-23 10:45:21 +0200 |
| commit | e7a917d3227a68f16b0c78c36339ad0d147b2dcd (patch) | |
| tree | 8e9c81d98abd6573fa109d36730e51baab1de997 | |
| parent | 186800348069bd8600480f1e915f9f8602befa83 (diff) | |
| download | perl-URPM-e7a917d3227a68f16b0c78c36339ad0d147b2dcd.tar perl-URPM-e7a917d3227a68f16b0c78c36339ad0d147b2dcd.tar.gz perl-URPM-e7a917d3227a68f16b0c78c36339ad0d147b2dcd.tar.bz2 perl-URPM-e7a917d3227a68f16b0c78c36339ad0d147b2dcd.tar.xz perl-URPM-e7a917d3227a68f16b0c78c36339ad0d147b2dcd.zip | |
Further prevent SRPM to conflicts with its own build deps
commit 3fac0be4adab0ee63b6473d613982b418cc7ab92 was not enough in iurt
case.
We must also ignore SRPM provides.
Rationale:
Since rpm-4.16+, rpmlib adds NEVR provides for all packages that would
be built into source rpm.
Thus we hit:
"installed package gdb-minimal-10.2-2.mga9.x86_64 is conflicting with gdb-11.1-1.mga9.src"
Because of "Conflicts: gdb-headless[> 10.2-2.mga9]"
Because gdb-11.1-1.mga9.src.rpm provides "gdb-headless = 11.1-1.mga9"
| -rw-r--r-- | Changes | 2 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- Further prevent SRPM to conflicts with its own build deps with rpm-4.16+ + Version 5.124 - 19 October 2021 - Prevent SRPM to conflicts with its own build deps diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 24c283b..dded564 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -1268,7 +1268,7 @@ sub resolve_requested__no_recommends_ { _handle_conflict($urpm, $state, $pkg, $p, $property, $property, \@properties, \%diff_provides_h, $options{keep} && \@keep); } } - }); + }) if $pkg->arch ne 'src'; # rpm-4.16+ add provides for all subpkgs to srpm which we don't care about for conflicts #- keep existing package and therefore cancel current one. if (@keep) { |