X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=merge_old_version;h=c5975ecc75e5f150b4d86408fdd644021ec199e7;hb=HEAD;hp=99ffa84f2cb164af13015aaff121539856326e80;hpb=a1da89c3815d37ec96fc9f298560852b2231e853;p=next-scripts

diff --git a/merge_old_version b/merge_old_version
index 99ffa84..c5975ec 100755
--- a/merge_old_version
+++ b/merge_old_version
@@ -93,14 +93,14 @@ d=$(date --date "5 hours ago" '+%Y%m%d')
 sed -i '$d' $SHA1_FILE
 printf "%s$tab%s\n" $tree $rev >>$SHA1_FILE
 
-$no_build && exit 0
-
 git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
 	echo git push failed 1>&2
 	bash -i || exit
 }
 
-"$bin_dir/do_build" || {
+$no_build && exit 0
+
+"$bin_dir/do_build" "$tree" || {
 	echo Build failed 1>&2
 	bash -i || exit
 }