diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-08 02:21:30 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-12-08 02:21:30 +0100 |
| commit | 82ba47688bc5364cc822c6b3b8a5addd0fc5b1e8 (patch) | |
| tree | 396730c424e3c6c87796022011652aa1db2af192 /bin/build-rpm-package | |
| parent | 43c43a552bdeab3181ab356425c429d6885d87e4 (diff) | |
| download | buildscripts-82ba47688bc5364cc822c6b3b8a5addd0fc5b1e8.tar.gz buildscripts-82ba47688bc5364cc822c6b3b8a5addd0fc5b1e8.tar.bz2 buildscripts-82ba47688bc5364cc822c6b3b8a5addd0fc5b1e8.zip | |
output build.log also on build failures, remove tmp dir if build fails
Diffstat (limited to 'bin/build-rpm-package')
| -rwxr-xr-x | bin/build-rpm-package | 22 |
1 files changed, 16 insertions, 6 deletions
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 } |