[X2Go-Commits] [buildscripts] 02/04: bin/build-rpm-package: clear pkgdist unconditially, even if an architecture is to be skipped.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository buildscripts.

commit 2cf89300f856f0844b380cbf1b7979d735a88625
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Sep 5 00:42:20 2019 +0200

    bin/build-rpm-package: clear pkgdist unconditially, even if an architecture is to be skipped.
---
 bin/build-rpm-package | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index e9df149..8d264be 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -844,12 +844,10 @@ clear_pkgdist() {
 						fi
 					fi
 
-					if [ "x${SKIP_ARCH}" != "x${l_ARCH}" ]; then
-						mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}"
-						rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SOURCES/"*
-						rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SRPMS/${RPMSRCPKG}-"*.src.rpm
-						rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*.rpm
-					fi
+					mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}"
+					rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SOURCES/"*
+					rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SRPMS/${RPMSRCPKG}-"*.src.rpm
+					rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*.rpm
 				done
 			done
 		}

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git