X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=triggers%2Ftrigger.volatile;h=0a91dca3e6c159e6d0bb53786f3bdc436576f58a;hb=9ef340664f076600ac35566d6a91911903ea3d0e;hp=6aab693b37380070ed5f4b01d77327c0a23e732a;hpb=e810b1094fa8c0f9fc4846d4121d079099b851a7;p=wannabuild.git

diff --git a/triggers/trigger.volatile b/triggers/trigger.volatile
index 6aab693..0a91dca 100755
--- 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