From 9682daf8a594ef3897aaa8846be4718ae6082f6a Mon Sep 17 00:00:00 2001 From: Hyunggi Lee Date: Wed, 7 Apr 2021 10:45:09 +0900 Subject: fix build dependency parse when Require(post) do not put extra deps after --directdepsend-- https://github.com/openSUSE/obs-build/commit/a9fdc7427ac10f64a3f7f0dac9fbc8a2a068948f#diff-051ae0ad33c737bb9e9091a77398c1b5b32ceda3cfc4b7da5bdc5a3b02610d0e Change-Id: I618aef703e6cfe55ccb37546aab394d14570c099 Signed-off-by: Hyunggi Lee --- expanddeps | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/expanddeps b/expanddeps index 05d6e3e..5a8af47 100755 --- a/expanddeps +++ b/expanddeps @@ -453,7 +453,7 @@ if ($recipe) { unshift @extradeps, @{$d->{'deps'} || []}; if ($d->{'prereqs'}) { my %deps = map {$_ => 1} (@extradeps, @{$d->{'subpacks'} || []}); - push @packdeps, grep {!$deps{$_} && !/^%/} @{$d->{'prereqs'}}; + push @extradeps, '--directdepsend--', grep {!$deps{$_} && !/^%/} @{$d->{'prereqs'}}; } } @@ -473,7 +473,7 @@ push @extradeps, '--ignoreignore--' if @sysdeps; if ($isvm) { push @packdeps, @{$cf->{'vminstall'}}; } -my @bdeps = Build::get_build($cf, $subpacks, @packdeps, @extradeps); +my @bdeps = Build::get_build($cf, $subpacks, @extradeps); if (!shift @bdeps) { print STDERR "expansion error\n"; -- cgit v1.2.3