From: Henrik Nordstrom <hno@squid-cache.org>
Date: Sat, 8 Mar 2008 13:16:53 +0000 (-0700)
Subject: Adjust snapshot paths and bzr branch names
X-Git-Tag: BASIC_TPROXY4~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3aaab7979a3d351a13804f345e1b40f32317883;p=thirdparty%2Fsquid.git

Adjust snapshot paths and bzr branch names
---

diff --git a/mksnapshot-cron.sh b/mksnapshot-cron.sh
index 3c7302a310..d0ea4d55f5 100755
--- 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 0568a66c0f..300f461cd7 100755
--- 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