X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=triggers%2Ftrigger.edu;h=4ff8861b1d83ab28390ba8c02336eb144587af3d;hb=1d0136f3738977c8c827aa79e302d42092ec95b3;hp=a3f5baee7495a12ed7f26adccf3538ff13716e04;hpb=e810b1094fa8c0f9fc4846d4121d079099b851a7;p=wannabuild.git diff --git a/triggers/trigger.edu b/triggers/trigger.edu index a3f5bae..4ff8861 100755 --- a/triggers/trigger.edu +++ b/triggers/trigger.edu @@ -2,7 +2,7 @@ # vim:set et ts=4 sw=4 ft=bash ai: ARCHIVE="debian-edu" -SUITES="lenny etch" +SUITES="lenny etch squeeze" ARCHES="i386 amd64 powerpc" . /org/wanna-build/triggers/common @@ -11,7 +11,7 @@ exec >> /org/wanna-build/db/merge.$ARCHIVE.log 2>&1 if [ -f /org/wanna-build/NO-TRIGGERS ] then - echo Trigger for $ARCHIVE skipped due to NO-TRIGGERS, aborting. >2 + echo Trigger for $ARCHIVE skipped due to NO-TRIGGERS, aborting. >&2 exit 0 fi @@ -33,16 +33,14 @@ main() { base_suite=$suite SOURCES="${ARCHIVE_BASE}/archive/${suite}-test/local/source/Sources.gz" PACKAGES="${ARCHIVE_BASE}/archive/${suite}-test/local/binary-%ARCH%/Packages.gz" - SOURCES_BASE="${ARCHIVE_MAIN}/archive/${base_suite}/{main,contrib}/source/Sources.gz" - SOURCES_BASE="${SOURCES_BASE} ${ARCHIVE_BASE}/archive/${suite}/local/source/Sources.gz" PACKAGES_BASE="${ARCHIVE_MAIN}/archive/${base_suite}/{main,contrib}/binary-%ARCH%/Packages.gz" PACKAGES_BASE="${PACKAGES_BASE} ${ARCHIVE_BASE}/archive/${suite}/local/binary-%ARCH%/Packages.gz" - trigger_wb_update_for_overlay "$base_suite" "$ARCHES" "$SOURCES_BASE" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES" "$suite-edu" + trigger_wb_update_with_secondary "$base_suite" "$ARCHES" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES" "$suite-edu" done cleanup } -main & +main exit 0