diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-10-11 15:44:52 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-10-11 15:44:52 +0200 |
| commit | 0ecb67c21111785399af8fd1e30b15ae4a436cbf (patch) | |
| tree | 286f859707b5ec1d02419017e527e94f4f54115e /bin/build-rpm-package | |
| parent | 691adc4c0e9118920fcd64d51f2d1547ee2b71dc (diff) | |
| download | buildscripts-0ecb67c21111785399af8fd1e30b15ae4a436cbf.tar.gz buildscripts-0ecb67c21111785399af8fd1e30b15ae4a436cbf.tar.bz2 buildscripts-0ecb67c21111785399af8fd1e30b15ae4a436cbf.zip | |
fix build.log removal and test for mock vs. obs-build
Diffstat (limited to 'bin/build-rpm-package')
| -rwxr-xr-x | bin/build-rpm-package | 4 |
1 files 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@x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log |