This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from a508622 bin/sbuild-deb-package: fix logical error that skipped all builds unless they are Architecture: all. new e56648a bin/sbuild-deb-package: only skip source packages if they only contain arch-indep binary packages. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/sbuild-deb-package | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit e56648ac7fe7a07356e4b85206c7eb12e1c2375e Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Nov 30 06:35:24 2017 +0100 bin/sbuild-deb-package: only skip source packages if they only contain arch-indep binary packages. --- bin/sbuild-deb-package | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index e1c33f8..7f0530b 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -469,7 +469,15 @@ 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 + # Debian source packages define one or more binary package(s), which + # can either be arch-indep or arch-dep. + # Just blindly looking for "Architecture: all" binary packages is not + # a good selector for skipping source packages entirely, as the + # source package can still also define arch-dep binary packages. + typeset -i has_arch_dep="0" + grep -Eqs "Architecture.*(any|${base_arch})" "${TEMP_DIR}/${PROJECT}/debian/control" && has_arch_dep="1" + + if [ "${has_arch_dep}" -eq "1" ] || [ "${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
-
git-admin＠x2go.org