From ed24d1e8179f77b66a636a6bf50ca2de432ebc9d Mon Sep 17 00:00:00 2001 From: Marc Brockschmidt Date: Thu, 8 Apr 2010 23:43:31 +0000 Subject: [PATCH] Use cat/gzip instead of keep-latest For the secondary package file, it was wrong to use keep-latest, as Modestas Vainius pointed out. With this change, files are just copied/unpacked, allowing edos-debcheck to correctly determine if the build-deps can be satisfied. This change affects the triggers for all non-standard (*-volatile, *-bpo, *-edu and experimental) suites, which should all use the aptitude dep resolver (able to handle such complex dep situations) on the buildds. --- triggers/trigger_wb_update_arch_loop_with_secondary | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/triggers/trigger_wb_update_arch_loop_with_secondary b/triggers/trigger_wb_update_arch_loop_with_secondary index c0d60ec..058e2e1 100755 --- a/triggers/trigger_wb_update_arch_loop_with_secondary +++ b/triggers/trigger_wb_update_arch_loop_with_secondary @@ -13,7 +13,17 @@ WB_SUITE="$6" 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 +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 -- 2.39.2