X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=triggers%2Fcommon;h=eee3339b791cceb4bde2a2321bc52893bbf5055e;hb=4359f5feb1a3be354cfc18ffb8876cd879b41147;hp=32ff7ac7b78d471671378f452568b42cf1f2399f;hpb=87bdb59ea5ceb14fcea8e5e72ec1349575781658;p=wannabuild.git

diff --git a/triggers/common b/triggers/common
index 32ff7ac..eee3339 100644
--- a/triggers/common
+++ b/triggers/common
@@ -7,6 +7,7 @@ PATH="/bin:/usr/bin:/org/wanna-build/bin:/org/buildd.debian.org/bin:/org/wanna-b
 ARCHIVE_MAIN="/org/wanna-build/tmp/archive/debian"
 ARCHIVE_BASE="/org/wanna-build/tmp/archive/${ARCHIVE}"
 PAS_BASE="/org/buildd.debian.org/web/quinn-diff"
+PAS_FILE="$PAS_BASE/$SUITE/Packages-arch-specific"
 LOCKFILE="${ARCHIVE_BASE}/lock"
 ARCHS_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
 ARCHS_lenny="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
@@ -61,21 +62,23 @@ do_wb_merge_all() {
         WB_SUITE="$SUITE"
     fi
 
-    if [ "$4" != "overlay" && "$4" != "secondary" ]
+    echo "do_wb_merge_all $SUITE/$ARCH started"
+    if test "$4" != "overlay" && test "$4" != "secondary"
     then
-        wanna-build -v --merge-all --arch=$ARCH --dist=$WB_SUITE \
-            Packages.$SUITE.$ARCH quinn-$SUITE.$ARCH Sources.$SUITE
+        #wanna-build -v --merge-all --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH quinn-$SUITE.$ARCH Sources.$SUITE
+        wanna-build -v --Pas ${PAS_FILE} --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH . Sources.$SUITE
     fi
-    if [ "$4" == "overlay" ]
+    if [ "$4" = "overlay" ]
     then
         wanna-build -v --merge-all --arch=$ARCH --dist=$WB_SUITE \
             Packages.$SUITE.$ARCH-all quinn-$SUITE.$ARCH Sources.$SUITE-all
     fi
-    if [ "$4" == "secondary" ]
+    if [ "$4" = "secondary" ]
     then
         wanna-build -v --merge-all-secondary --arch=$ARCH --dist=$WB_SUITE \
             Packages.$SUITE.$ARCH quinn-$SUITE.$ARCH Sources.$SUITE Packages.$SUITE.$ARCH-all
     fi
+    echo "do_wb_merge_all $SUITE/$ARCH done"
 }
 
 cleanup() {
@@ -105,7 +108,7 @@ trigger_wb_update() {
     echo "`date`: Processing ${ARCHIVE}/${SUITE} ..."
 
     new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
-    parallel -l 5 -i trigger_wb_update_arch_loop "${SUITE}" "{}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" -- ${ARCHS}
+    parallel -l 5 -i trigger_wb_update_arch_loop "${SUITE}" "{}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" -- ${ARCHS} || true
     #for ARCH in ${ARCHS}; do
     #trigger_wb_update_arch_loop "${SUITE}" "${ARCH}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}"
     #done
@@ -133,7 +136,7 @@ trigger_wb_update_for_overlay() {
     new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
     new-keep-latest source $(eval echo Sources.${SUITE} ${SOURCES_BASE}) > Sources.${SUITE}-all
 
-    parallel -l 5 -i trigger_wb_update_for_overlay_arch_loop "${SUITE}" "{}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS}
+    parallel -l 5 -i trigger_wb_update_for_overlay_arch_loop "${SUITE}" "{}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS} || true
     #for ARCH in ${ARCHS}; do
     #trigger_wb_update_for_overlay_arch_loop "${SUITE}" "${ARCH}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}"
     #done
@@ -164,7 +167,7 @@ trigger_wb_update_with_secondary() {
 
     new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
 
-    parallel -l 5 -i trigger_wb_update_arch_loop_with_secondary "${SUITE}" "{}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS}
+    parallel -l 5 -i trigger_wb_update_arch_loop_with_secondary "${SUITE}" "{}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS} || true
     #for ARCH in ${ARCHS}; do
     #trigger_wb_update_arch_loop_with_secondary "${SUITE}" "${ARCH}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}"
     #done