wanna-build/merge-v3: allow to specify source packages which are considered

[wannabuild.git] / triggers / trigger.volatile

diff --git a/triggers/trigger.volatile b/triggers/trigger.volatile
index 6aab693b37380070ed5f4b01d77327c0a23e732a..0a91dca3e6c159e6d0bb53786f3bdc436576f58a 100755 (executable)
--- a/triggers/trigger.volatile
+++ b/triggers/trigger.volatile
@@ -34,14 +34,13 @@ main() {
 
     for suite in $SUITES
     do
-        SOURCES="${ARCHIVE_BASE}/archive/${suite}/volatile/{main,contrib}/source/Sources.gz"
-        SOURCES="${SOURCES} ${ARCHIVE_BASE}/archive/${suite}-proposed-updates/volatile/{main,contrib}/source/Sources.gz"
-        PACKAGES="${ARCHIVE_BASE}/archive/${suite}/volatile/{main,contrib}/binary-%ARCH%/Packages.gz"
-        PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/archive/${suite}-proposed-updates/volatile/{main,contrib}/binary-%ARCH%/Packages.gz"
+        SOURCES="${ARCHIVE_BASE}/archive/${suite}/volatile/{main,contrib,non-free}/source/Sources.gz"
+        SOURCES="${SOURCES} ${ARCHIVE_BASE}/archive/${suite}-proposed-updates/volatile/{main,contrib,non-free}/source/Sources.gz"
+        PACKAGES="${ARCHIVE_BASE}/archive/${suite}/volatile/{main,contrib,non-free}/binary-%ARCH%/Packages.gz"
+        PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/archive/${suite}-proposed-updates/volatile/{main,contrib,non-free}/binary-%ARCH%/Packages.gz"
         #As volatile is an overlay, also add Debian ${suite}:
-        SOURCES_BASE="${ARCHIVE_MAIN}/archive/${suite}/{main,contrib}/source/Sources.gz"
         PACKAGES_BASE="${ARCHIVE_MAIN}/archive/${suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
-        trigger_wb_update_for_overlay "$suite" "`get_architectures $suite`" "$SOURCES_BASE" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES" "$suite-volatile"
+        trigger_wb_update_with_secondary "$suite" "`get_architectures $suite`" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES" "$suite-volatile"
     done
 
     cleanup