#At file:///home/jonas/src/telco-6.4/
2649 jonas@stripped 2008-06-08 [merge]
merge
modified:
storage/ndb/test/run-test/autotest-boot.sh
=== modified file 'storage/ndb/test/run-test/autotest-boot.sh'
--- a/storage/ndb/test/run-test/autotest-boot.sh 2007-08-31 14:12:51 +0000
+++ b/storage/ndb/test/run-test/autotest-boot.sh 2008-06-08 05:21:05 +0000
@@ -78,7 +78,7 @@ fi
# Validate that all interesting
# variables where set in conf
###############################
-vars="src_clone_base install_dir build_dir"
+vars="src_clone_base install_dir build_dir bzr_src_base"
for i in $vars
do
t=`echo echo \\$$i`
@@ -103,7 +103,8 @@ fi
# Setup the clone source location #
####################################
-src_clone=${src_clone_base}${clone}
+#src_clone=${src_clone_base}/${clone}
+src_clone=${bzr_src_base}/${clone}
#######################################
# Check to see if the lock file exists#
@@ -152,12 +153,7 @@ fi
if [ "$do_clone" ]
then
rm -rf $dst_place
- if [ `echo $src_clone | grep -c 'file:\/\/'` = 1 ]
- then
- bk clone -l $extra_clone $src_clone $dst_place
- else
- bk clone $extra_clone $src_clone $dst_place
- fi
+ bzr export $dst_place $extra_clone $src_clone
fi
##########################################
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-6.4 branch (jonas:2649) | jonas | 8 Jun |