[X2Go-Commits] [buildscripts] 01/01: fix build.log removal and test for mock vs. obs-build

git-admin at x2go.org git-admin at x2go.org
Sat Oct 11 15:44:59 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 0ecb67c21111785399af8fd1e30b15ae4a436cbf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 11 15:44:52 2014 +0200

    fix build.log removal and test for mock vs. obs-build
---
 bin/build-rpm-package |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 4c72986..e1df3f7 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -229,8 +229,7 @@ build_packages() {
 				#fi
 
 				if [ "x$SKIP_ARCH" != "xx86_64" ] || [ "$IS_NOARCH" = "yes" ]; then
-					rm -f $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log
-					if [ "x$PKGDIST" = "xopensuse" ]; then
+					if [ "x$l_DIST" = "xopensuse" ]; then
 						mkdir -p "/var/cache/obs-build/$PKGDIST/$l_DIST/$l_CODENAME/x86_64/"
 						OPENSUSE_DOWNLOAD_URL=$(echo "$OPENSUSE_DOWNLOAD_URL" | sed 's/#VERSION#/$l_DIST/')
 						if obs-build --repo "$OPENSUSE_DOWNLOAD_URL" \
@@ -248,6 +247,7 @@ build_packages() {
 							echo "Waiting for some other build to finish..."
 							sleep 30
 						done
+						rm -f $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log
 						if mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then
 							rpmsign-unattended -D "%_gpg_name debian at x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm
 							cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list