From 82ba47688bc5364cc822c6b3b8a5addd0fc5b1e8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 8 Dec 2013 02:21:30 +0100 Subject: output build.log also on build failures, remove tmp dir if build fails --- bin/build-rpm-package | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/build-rpm-package b/bin/build-rpm-package index cd6af45..93f6eb9 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -230,18 +230,28 @@ build_packages() { echo "Waiting for some other build to finish..." sleep 30 done - mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm - cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log - rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm + if mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then + rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm + cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log + else + cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log + rm -Rf "$TEMP_DIR" + exit -1 + fi fi if [ "x$SKIP_ARCH" != "xi386" ] && [ "$IS_NOARCH" != "yes" ]; then while [ -d ~mock/${l_DIST}-${l_CODENAME}-i386 ]; do echo "Waiting for some other build to finish..." sleep 30 done - mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm - cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log - rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/i386/*.rpm + if mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then + rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/i386/*.rpm + cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log + else + cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log + rm -Rf "$TEMP_DIR" + exit -1 + fi fi done } -- cgit v1.2.3