wanna-build/merge-v3: fix handling of multiple Packages/Sources files

[wannabuild.git] / triggers / trigger.debian

diff --git a/triggers/trigger.debian b/triggers/trigger.debian
index bccd883e2b81913b7003c6a554a84afee28f2d0b..6b6b8d58e4842fe3a1ee72dba7767f876c1e6c24 100755 (executable)
--- a/triggers/trigger.debian
+++ b/triggers/trigger.debian
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 # vim:set et ts=4 sw=4 ft=sh ai:
 
 ARCHIVE="debian"
@@ -43,11 +43,15 @@ main_sync() {
 
     for SUITE in $SUITES_FAST_AUTOBUILD
     do
-        SOURCES="${ARCHIVE_BASE}/archive/${SUITE}/{main,contrib,non-free}/source/Sources.gz"
+        SOURCES="${ARCHIVE_BASE}/archive/${SUITE}/{main,contrib}/source/Sources.gz"
         SOURCES="${SOURCES} ${ARCHIVE_BASE}/buildd-${SUITE}/Sources.gz"
+        NFSOURCES="${ARCHIVE_BASE}/archive/${SUITE}/non-free/source/Sources.gz"
         PACKAGES="${ARCHIVE_BASE}/archive/${SUITE}/{main,contrib}/binary-%ARCH%/Packages.gz"
         PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/archive/${SUITE}/{main,contrib}/debian-installer/binary-%ARCH%/Packages.gz"
         PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/buildd-${SUITE}/Packages.gz"
+        NFPACKAGES="${ARCHIVE_BASE}/archive/${SUITE}/non-free/binary-%ARCH%/Packages.gz"
+        NFPACKAGES="${NFPACKAGES} ${ARCHIVE_BASE}/archive/${SUITE}/non-free/debian-installer/binary-%ARCH%/Packages.gz"
+        /org/wanna-build/triggers/filter-nonfree /org/wanna-build/etc/non-free-include-list "`get_architectures $SUITE`" Sources.${SUITE}.non-free Packages.${SUITE}.%ARCH%.non-free ${NFSOURCES} . ${NFPACKAGES} || true
 
         if [ "$SUITE" != "experimental" ]
         then