Adjust snapshot paths and bzr branch names

diff --git a/mksnapshot-cron.sh b/mksnapshot-cron.sh
index 3c7302a310a90461714b6f686a41ea5205f53ad4..d0ea4d55f5b61be048e41d6aaabaea9b9811ebe6 100755 (executable)
--- a/mksnapshot-cron.sh
+++ b/mksnapshot-cron.sh
@@ -82,7 +82,7 @@ make_snapshot()
 set +e
 
 ../commit/bootstrap squid-3
-make_snapshot ../commit/squid-3/mksnapshot.sh HEAD v3 HEAD 6
+make_snapshot ../commit/squid-3/mksnapshot.sh trunk v3 HEAD 6
 
 rm -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
 cp ../commit/squid-3/CONTRIBUTORS /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new
@@ -95,7 +95,7 @@ chmod 444 /server/httpd/htdocs/squid-cache.org/SPONSORS.new
 mv -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new /server/httpd/htdocs/squid-cache.org/SPONSORS.txt
 
 ../commit/bootstrap squid-3.0
-make_snapshot ../commit/squid-3.0/mksnapshot.sh SQUID_3_0 v3 3.0 3
+make_snapshot ../commit/squid-3.0/mksnapshot.sh branches/SQUID_3_0 v3 3.0 3
 
 ../commit/bootstrap squid-2
 make_snapshot ../commit/squid-2/mksnapshot.sh HEAD v2 HEAD 3

diff --git a/mksnapshot.sh b/mksnapshot.sh
index 0568a66c0f28ec2670e42618d29b53682546846c..300f461cd77f3f58f0144a7112fb72ed2aa06536 100755 (executable)
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -27,7 +27,7 @@ rm -rf $tmpdir
 trap "rm -rf $tmpdir" 0
 
 rm -f ${tag}.out
-bzr export $tmpdir $BZRROOT/$branchpath || exit 1
+bzr export $tmpdir $BZRROOT/$module/$branchpath || exit 1
 if [ ! -f $tmpdir/configure ]; then
        echo "ERROR! Tag $tag not found in $module"
 fi