X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=triggers%2Ftrigger.debian-buildd;h=dacaad0d1d1b4c70870766e666e8a59b4fab9806;hb=ecdd3ec8d7247cb92defb0f071114eb295611196;hp=ff398d66ceec4d4a5ab70a57a81053890093a217;hpb=e810b1094fa8c0f9fc4846d4121d079099b851a7;p=wannabuild.git

diff --git a/triggers/trigger.debian-buildd b/triggers/trigger.debian-buildd
index ff398d6..dacaad0 100755
--- a/triggers/trigger.debian-buildd
+++ b/triggers/trigger.debian-buildd
@@ -26,9 +26,10 @@ main() {
     sync.sh $ARCHIVE nolock
 
     # Handle unstable as a normal suite.
-    suite=unstable
+    suite=sid
     SOURCES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/source/Sources.gz"
-    SOURCES="${SOURCES} ${ARCHIVE_BASE}/buildd-${suite}/Sources.gz"
+    filter_out_nonfree "${ARCHIVE_BASE}/buildd-${suite}/Sources.gz" "Sources.${suite}.incoming-filtered.gz"
+    SOURCES="${SOURCES} Sources.${suite}.incoming-filtered.gz"
     PACKAGES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
     PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/archive/${suite}/main/debian-installer/binary-%ARCH%/Packages.gz"
     PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/buildd-${suite}/Packages.gz"
@@ -36,20 +37,21 @@ main() {
 
     # Handle experimental as an overlay suite.
     suite=experimental
-    base_suite=unstable
+    base_suite=sid
     SOURCES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/source/Sources.gz"
-    SOURCES="${SOURCES} ${ARCHIVE_BASE}/buildd-${suite}/Sources.gz"
+    filter_out_nonfree "${ARCHIVE_BASE}/buildd-${suite}/Sources.gz" "Sources.${suite}.incoming-filtered.gz"
+    SOURCES="${SOURCES} Sources.${suite}.incoming-filtered.gz"
     PACKAGES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
     PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/buildd-${suite}/Packages.gz"
 
-    SOURCES_BASE="${ARCHIVE_MAIN}/archive/${base_suite}/{main,contrib}/source/Sources.gz"
     PACKAGES_BASE="${ARCHIVE_MAIN}/archive/${base_suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
     PACKAGES_BASE="${PACKAGES_BASE} ${ARCHIVE_MAIN}/archive/${base_suite}/main/debian-installer/binary-%ARCH%/Packages.gz"
-    trigger_wb_update_for_overlay "$suite" "`get_architectures $suite`" "$SOURCES_BASE" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES"
+    #PACKAGES_BASE="${PACKAGES_BASE} ${ARCHIVE_MAIN}/buildd-${BASE_SUITE}/Packages.gz"
+    trigger_wb_update_with_secondary "$suite" "`get_architectures $suite`" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES"
 
     cleanup
 }
 
-main &
+main
 exit 0