Revert "add non-free files to quinn-diff (and to wanna-build)"

[wannabuild.git] / triggers / common

diff --git a/triggers/common b/triggers/common
index d48cbfc5dfe7eb5bf860645e2d7d8e62eace4ea2..2b0062f5673010be112893ac18b0d6128a0b832e 100644 (file)
--- a/triggers/common
+++ b/triggers/common
@@ -61,14 +61,23 @@ do_wb_merge_all() {
         WB_SUITE="$SUITE"
     fi
 
-    if [ "$4" != "overlay" ]
+    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
-    else
+    fi
+    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" ]
+    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() {
@@ -98,7 +107,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
@@ -126,7 +135,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
@@ -134,3 +143,34 @@ trigger_wb_update_for_overlay() {
     echo "`date`: ${ARCHIVE}/${SUITE} done"
 }
 
+# This is for the case where you get also get packages from
+# a secondary unrelated suite, the buildd's chroot also has
+# those packages files in it.
+# Examples are *-{volatile,backports,edu} and experimental
+# This is not for something like stable and proposed-updates
+trigger_wb_update_with_secondary() {
+    SUITE="$1"
+    ARCHS="$2"
+    PACKAGES_BASE="$3"
+    SOURCES="$4"
+    PACKAGES="$5"
+    WB_SUITE="$6"
+    WHITELIST_FILE="$7"
+
+    if [ -z "$WB_SUITE" ]
+    then
+        WB_SUITE="${SUITE}"
+    fi
+
+    echo "`date`: Processing ${ARCHIVE}/${SUITE} ..."
+
+    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} || true
+    #for ARCH in ${ARCHS}; do
+    #trigger_wb_update_arch_loop_with_secondary "${SUITE}" "${ARCH}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}"
+    #done
+
+    echo "`date`: ${ARCHIVE}/${SUITE} done"
+}
+