merge-v3: specify correct Packages-arch-specifc-file

[wannabuild.git] / triggers / common

diff --git a/triggers/common b/triggers/common
index 2b0062f5673010be112893ac18b0d6128a0b832e..eee3339b791cceb4bde2a2321bc52893bbf5055e 100644 (file)
--- a/triggers/common
+++ b/triggers/common
@@ -7,6 +7,7 @@ PATH="/bin:/usr/bin:/org/wanna-build/bin:/org/buildd.debian.org/bin:/org/wanna-b
 ARCHIVE_MAIN="/org/wanna-build/tmp/archive/debian"
 ARCHIVE_BASE="/org/wanna-build/tmp/archive/${ARCHIVE}"
 PAS_BASE="/org/buildd.debian.org/web/quinn-diff"
+PAS_FILE="$PAS_BASE/$SUITE/Packages-arch-specific"
 LOCKFILE="${ARCHIVE_BASE}/lock"
 ARCHS_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
 ARCHS_lenny="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
@@ -64,8 +65,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 --Pas ${PAS_FILE} --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH . Sources.$SUITE
     fi
     if [ "$4" = "overlay" ]
     then