From: Remi Gacogne Date: Mon, 28 Aug 2023 12:19:53 +0000 (+0200) Subject: fix the provenance generation X-Git-Tag: dnsdist-1.8.1^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd8dd1ff67b6b3bfeec64167e5e948ad9ccb8cab;p=thirdparty%2Fpdns.git fix the provenance generation --- diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild index c18859c260..d98a6826c6 100644 --- a/builder-support/dockerfiles/Dockerfile.rpmbuild +++ b/builder-support/dockerfiles/Dockerfile.rpmbuild @@ -59,10 +59,10 @@ RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then @ENDIF # Generate provenance -@IF [ ${BUILDER_TARGET} = el-7 || ${BUILDER_TARGET} = centos-7 ] +@IF [ "${BUILDER_TARGET}" = "el-7" -o "${BUILDER_TARGET}" = "centos-7" ] @EVAL RUN python builder/helpers/generate-yum-provenance.py /dist/packages-${BUILDER_TARGET}.json || python3 builder/helpers/generate-yum-provenance.py /dist/packages-${BUILDER_TARGET}.json @ENDIF -@IF [ ${BUILDER_TARGET} != el-7 && ${BUILDET_TARGET} != centos-7 ] +@IF [ "${BUILDER_TARGET}" != "el-7" -a "${BUILDER_TARGET}" != "centos-7" ] @EVAL RUN python builder/helpers/generate-dnf-provenance.py /dist/packages-${BUILDER_TARGET}.json || python3 builder/helpers/generate-dnf-provenance.py /dist/packages-${BUILDER_TARGET}.json @ENDIF