From 12aebfba9c1d4cb858ae0f465aed43013c4ad272 Mon Sep 17 00:00:00 2001 From: brian Date: Mon, 12 Dec 2005 18:45:39 +0000 Subject: [PATCH] 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. --- build/land1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/land1.sh b/build/land1.sh index d3d643e..274eec6 100755 --- 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 - $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 } -- 1.8.3.1