X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=do_merge;fp=do_merge;h=d7ecb2f06c373da945bd450740172ec210b4b1d8;hb=f0849d63e02a5bf561debb751584e45b22a66abe;hp=955f52a4e82c0d90f510e595a41aeb3e8b2fd4b5;hpb=e048d8273b6d93b94e5bd686788df3eb024d188d;p=next-scripts diff --git a/do_merge b/do_merge index 955f52a..d7ecb2f 100755 --- a/do_merge +++ b/do_merge @@ -139,8 +139,7 @@ for h in $heads; do continue fi - do_build=$(awk -F '\t' '/^[^#]/ && $3=="'"$tree"'" { print $6; }' "$CTRL_FILE") - if [ "$do_build" != "yes" ]; then + if [ "$(get_build_flag "$tree")" != "yes" ]; then continue fi