]> git.donarmstrong.com Git - wannabuild.git/commitdiff
triggers/common: fix merge for overlay suites (i.e. oldstable, stable,
authorAndreas Barth <aba@not.so.argh.org>
Sun, 6 Jun 2010 09:00:52 +0000 (09:00 +0000)
committerAndreas Barth <aba@not.so.argh.org>
Sun, 6 Jun 2010 10:18:40 +0000 (10:18 +0000)
testing): only consider the source files to be present from proposed-updates.

triggers/common

index d6d60c859696594d943654a2232c01e318c96de6..ffeb75224122fcfb2b9277e7e61f6ffe1b2f76b4 100644 (file)
@@ -71,7 +71,8 @@ do_wb_merge_all() {
     if [ "$4" = "overlay" ]
     then
         #wanna-build -v --merge-all --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH-all quinn-$SUITE.$ARCH Sources.$SUITE-all
-        wanna-build -v --Pas ${PAS_FILE} --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH-all . Sources.$SUITE-all
+        # this currently makes the packages unknown to wanna-build. Perhaps we should keep them in pseudo-installed or so. Hm.
+        wanna-build -v --Pas ${PAS_FILE} --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH . Sources.$SUITE . Packages.$SUITE.$ARCH-all
     fi
     if [ "$4" = "secondary" ]
     then