Skip to content

Commit

Permalink
Mark dynamically generated buildrequires autogenerated
Browse files Browse the repository at this point in the history
This makes them in line with regular auto-generated dependencies and allows
them to be easily identified. It also makes parseRCPOT() error reporting
do the right thing: generated dependencies do not relate to spec lines.

Fixes rpm-software-management#801 (also reported as RhBug:1759100)
  • Loading branch information
pmatilai authored and ffesti committed Oct 9, 2019
1 parent e220cea commit bee5dc9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build/build.c
Expand Up @@ -201,7 +201,7 @@ static int doBuildRequires(rpmSpec spec, int test)

for (int i = 0; i < outc; i++) {
parseRCPOT(spec, spec->sourcePackage, output[i], RPMTAG_REQUIRENAME,
0, 0, addReqProvPkg, NULL);
0, RPMSENSE_FIND_REQUIRES, addReqProvPkg, NULL);
}

rpmdsPutToHeader(
Expand Down
16 changes: 8 additions & 8 deletions tests/rpmbuild.at
Expand Up @@ -1603,16 +1603,16 @@ cp "${abs_srcdir}"/data/SOURCES/buildrequires-1.0.tar.gz ${TOPDIR}/SOURCES

run rpmbuild \
-br --quiet --nodeps "${abs_srcdir}"/data/SPECS/buildrequires.spec
runroot rpm -qpR /build/SRPMS/buildrequires-1.0-1.buildreqs.nosrc.rpm
runroot rpm -qpvR /build/SRPMS/buildrequires-1.0-1.buildreqs.nosrc.rpm
],
[0],
[(bar = 3.4 or bar = 3.5)
foo > 1.3
foo-bar = 2.0
rpmlib(CompressedFileNames) <= 3.0.4-1
rpmlib(DynamicBuildRequires) <= 4.15.0-1
rpmlib(FileDigests) <= 4.6.0-1
rpmlib(RichDependencies) <= 4.12.0-1
[auto: (bar = 3.4 or bar = 3.5)
auto: foo > 1.3
auto: foo-bar = 2.0
rpmlib: rpmlib(CompressedFileNames) <= 3.0.4-1
rpmlib: rpmlib(DynamicBuildRequires) <= 4.15.0-1
rpmlib: rpmlib(FileDigests) <= 4.6.0-1
rpmlib: rpmlib(RichDependencies) <= 4.12.0-1
],
[ignore])
AT_CLEANUP
Expand Down

0 comments on commit bee5dc9

Please sign in to comment.