[X2Go-Commits] [buildscripts] 01/01: bin/sbuild-deb-package: fix logical error that skipped all builds unless they are Architecture: all.

git-admin at x2go.org git-admin at x2go.org
Thu Nov 30 05:52:54 CET 2017


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

x2go pushed a commit to branch master
in repository buildscripts.

commit a508622a7c3058e494aa6d755040b5a27c631ec0
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Nov 30 05:52:27 2017 +0100

    bin/sbuild-deb-package: fix logical error that skipped all builds unless they are Architecture: all.
---
 bin/sbuild-deb-package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index abc0491..e1c33f8 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -469,7 +469,7 @@ build_packages() {
 
 				typeset base_arch="${arches[0]}"
 				if [ -n "${base_arch}" ] && [ "x${SKIP_ARCH}" != "x${base_arch}" ] && grep -Eqs "Architecture.*(all|any|${base_arch})" "${TEMP_DIR}/${PROJECT}/debian/control"; then
-					if grep -Eqs 'Architecture.*all' "${TEMP_DIR}/${PROJECT}/debian/control" && [ "${skip_arch_all}" -eq "0" ]; then
+					if ! grep -Eqs 'Architecture.*all' "${TEMP_DIR}/${PROJECT}/debian/control" || [ "${skip_arch_all}" -eq "0" ]; then
 						typeset indirect="sbuild_options_${base_arch}[@]"
 						typeset -a indirect_resolve
 						indirect_resolve=("${!indirect}")

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


More information about the x2go-commits mailing list