aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changes2
-rw-r--r--URPM/Resolve.pm1
2 files changed, 3 insertions, 0 deletions
diff --git a/Changes b/Changes
index 1c002e8..d57f3b6 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+- Prevent SRPM to conflicts with its own build deps
+
Version 5.123 - 4 November 2020
- Fix file descriptor leak in rpm transactions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index c799dff..24c283b 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -1307,6 +1307,7 @@ sub _handle_conflicts_with_selected {
if (my $n = property2name($_)) {
foreach my $p ($urpm->packages_providing($n)) {
$pkg == $p and next;
+ $p->arch eq 'src' and next;
$p->provides_overlap($_) or next;
if (exists $state->{selected}{$p->id}) {
$urpm->{debug_URPM}($pkg->fullname . " conflicts with already selected package " . $p->fullname) if $urpm->{debug_URPM};