From edb9f78e3b579ea0dc0e3ade4898439f8459281e Mon Sep 17 00:00:00 2001 From: Andreas Barth Date: Fri, 4 Jun 2010 10:52:13 +0000 Subject: [PATCH] activate merge-v3 for "simple suites" (e.g. unstable) --- triggers/common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/triggers/common b/triggers/common index 2b0062f..9ea7918 100644 --- a/triggers/common +++ b/triggers/common @@ -64,8 +64,8 @@ do_wb_merge_all() { 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 --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH . Sources.$SUITE fi if [ "$4" = "overlay" ] then -- 2.39.2