The branch, master has been updated
via 82ba47688bc5364cc822c6b3b8a5addd0fc5b1e8 (commit)
from 43c43a552bdeab3181ab356425c429d6885d87e4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 82ba47688bc5364cc822c6b3b8a5addd0fc5b1e8
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sun Dec 8 02:21:30 2013 +0100
output build.log also on build failures, remove tmp dir if build fails
-----------------------------------------------------------------------
Summary of changes:
bin/build-rpm-package | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
The diff of changes is:
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(a)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(a)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(a)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(a)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
}
hooks/post-receive
--
buildscripts.git (X2Go packaging scripts)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "buildscripts.git" (X2Go packaging scripts).