diff options
author | Hyunggi Lee <hyunggi.lee@samsung.com> | 2021-04-07 10:45:09 +0900 |
---|---|---|
committer | Hyunggi Lee <hyunggi.lee@samsung.com> | 2021-04-07 12:51:08 +0900 |
commit | 9682daf8a594ef3897aaa8846be4718ae6082f6a (patch) | |
tree | 9d184281ecbb3ed3c44cbb56463f766f2ba68556 | |
parent | 039b9b7f091898dd7d3ba229759b4fd82e562d25 (diff) | |
download | build-9682daf8a594ef3897aaa8846be4718ae6082f6a.tar.gz build-9682daf8a594ef3897aaa8846be4718ae6082f6a.tar.bz2 build-9682daf8a594ef3897aaa8846be4718ae6082f6a.zip |
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 <hyunggi.lee@samsung.com>
-rwxr-xr-x | expanddeps | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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"; |