When landing, strip the trailing segments off of the dirname (given to

land1.sh) to ensure we use the ChangeLog file at the top of the module.
This is needed when trying to land only a subdirectory of a module.

diff --git a/build/land1.sh b/build/land1.sh
index d3d643e..274eec6 100755 (executable)
--- a/build/land1.sh
+++ b/build/land1.sh
@@ -55,7 +55,7 @@ TEST_FILE=${TEST_FILE:-ChangeLog} # does this need to be smarter?
 check_tag() {
        [ -z "$1" ] && echo "check_tag() missing arg" && exit3
        [ "$1" = "HEAD" ] && return
 check_tag() {
        [ -z "$1" ] && echo "check_tag() missing arg" && exit3
        [ "$1" = "HEAD" ] && return

-       $CVS log $dir/$TEST_FILE 2> /dev/null | grep -q "       $1: " && return
+       $CVS log ${dir%%/*}/$TEST_FILE 2> /dev/null | grep -q " $1: " && return

        echo "${progname}: tag $1 not found in $dir/$TEST_FILE"
        exit 2
 }
        echo "${progname}: tag $1 not found in $dir/$TEST_FILE"
        exit 2
 }