This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 7a6644264a11742fae05744941ef83e7ec603248 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 1 22:30:21 2022 +0100 bin/build-rpm-package: call /usr/bin/mock directly instead of relying on PATH. --- bin/build-rpm-package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 0217b0e..9fe88ca 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -199,7 +199,7 @@ check_mock_version_atleast () { exit 1 fi - typeset MOCK_VER="$(mock --version)" + typeset MOCK_VER="$(/usr/bin/mock --version)" # Sanitize ${MOCK_VER}: # Only take the first line into account. @@ -1104,7 +1104,7 @@ build_packages() { # Obtain packages from our RPM repository. get_extra_repository "redhat" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "${base_arch}" "${RPM_WANT_EXTRA_REPOS}" - if mock --buildsrpm \ + if /usr/bin/mock --buildsrpm \ ${MOCK_CHROOT_CONFIG} \ --resultdir="${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/" \ --spec "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SOURCES/${PROJECT}.spec" \ @@ -1209,7 +1209,7 @@ build_packages() { # For information on why this weird -print0 | read -r -d '' construction works, # refer to the first instance of this in this script. find "${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/" -type 'f' -iname "${RPMSRCPKG}-${UPSTREAM_VERSION}-${PKG_SRCRELEASE}.${IS_RELEASE}.git${DATE}.${GITREV}.${COMPONENT}.*.src.rpm" -print0 | while read -r -d '' srpm; do - if mock ${MOCK_CHROOT_CONFIG} --resultdir="${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" "${srpm}"; then + if /usr/bin/mock ${MOCK_CHROOT_CONFIG} --resultdir="${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" "${srpm}"; then # Clean up source RPM files. We build them separately. find "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" -type 'f' -iname '*.src.rpm' -exec rm -f -- '{}' \; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git