]> git.donarmstrong.com Git - wannabuild.git/commitdiff
activate merge-v3 for "simple suites" (e.g. unstable)
authorAndreas Barth <aba@not.so.argh.org>
Fri, 4 Jun 2010 10:52:13 +0000 (10:52 +0000)
committerAndreas Barth <aba@not.so.argh.org>
Fri, 4 Jun 2010 10:52:13 +0000 (10:52 +0000)
triggers/common

index 2b0062f5673010be112893ac18b0d6128a0b832e..9ea791840a0ffc7bd5c68f3788335ddb2054a82c 100644 (file)
@@ -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