Use cat/gzip instead of keep-latest

[wannabuild.git] / triggers / trigger_wb_update_arch_loop_with_secondary

diff --git a/triggers/trigger_wb_update_arch_loop_with_secondary b/triggers/trigger_wb_update_arch_loop_with_secondary
index a3960ea3f808375b147928aa231d82acff623796..058e2e1d3e478b08b384f283d5e908fbd1d5955b 100755 (executable)
--- a/triggers/trigger_wb_update_arch_loop_with_secondary
+++ b/triggers/trigger_wb_update_arch_loop_with_secondary
@@ -10,10 +10,20 @@ PACKAGES_BASE="$3"
 SOURCES="$4"
 PACKAGES="$5"
 WB_SUITE="$6"
-EXT=""
+WHITELIST_FILE="$7"
 
 new-keep-latest ${ARCH} $(eval echo $(echo ${PACKAGES} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}
-new-keep-latest ${ARCH} Packages.${SUITE}.${ARCH} $(eval echo $(echo ${PACKAGES_BASE} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}-all
-do_quinn ${SUITE} ${ARCH} "${EXT}"
+rm Packages.${SUITE}.${ARCH}-all
+for FILE in Packages.${SUITE}.${ARCH} $(eval echo $(echo ${PACKAGES_BASE} | sed -e 's/%ARCH%/${ARCH}/g')); do
+       case $FILE in
+               *.gz)
+                       gzip -dc < $FILE >> Packages.${SUITE}.${ARCH}-all
+                       ;;
+               *)   
+                       cat < $FILE >> Packages.${SUITE}.${ARCH}-all
+                       ;;
+       esac
+done
+do_quinn ${SUITE} ${ARCH} "${WHITELIST_FILE}"
 do_wb_merge_all ${SUITE} ${ARCH} ${WB_SUITE} secondary