Skip to content

Commit df3ab84

Browse files
committed
Support the old "otherproviders()" conflict
It seems to be still in use.
1 parent 96a8f2d commit df3ab84

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

Build/Expand.pm

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ sub checkconflicts {
4545
$ret = 1 if check_conddeps_notinst($q, $n, $eq, $ins);
4646
next;
4747
}
48-
my @eq = grep {$ins->{$_}} @{$whatprovides->{$r} || Build::addproviders($config, $r)};
48+
my @eq;
49+
if ($r =~ /^otherproviders\((.*)\)$/) {
50+
@eq = grep {$ins->{$_}} @{$whatprovides->{$1} || Build::addproviders($config, $1)};
51+
} else {
52+
@eq = grep {$ins->{$_}} @{$whatprovides->{$r} || Build::addproviders($config, $r)};
53+
}
4954
next unless @eq;
5055
push @$eq, map {"(provider $q conflicts with $_)"} @eq;
5156
$ret = 1;
@@ -555,6 +560,9 @@ sub expand {
555560
my $n = normalizerich($config, $p, $r, 1, \@error);
556561
check_conddeps_inst($p, $n, \@error, \%p, \%naconflicts, \@todo, \%todo_cond);
557562
next;
563+
} elsif ($r =~ /^otherproviders\((.*)\)$/) {
564+
$naconflicts{$_} = "is in conflict with $p" for @{$whatprovides->{$1} || Build::addproviders($config, $1)};
565+
next;
558566
}
559567
$naconflicts{$_} = "is in conflict with $p" for @{$whatprovides->{$r} || Build::addproviders($config, $r)};
560568
}

0 commit comments

Comments
 (0)