diff options
Diffstat (limited to 'localvcsactions')
| -rwxr-xr-x | localvcsactions | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/localvcsactions b/localvcsactions index 0708638..a8923d4 100755 --- a/localvcsactions +++ b/localvcsactions @@ -21,9 +21,10 @@ for project in $projects; do versys="CVS" versysfile="cvs" repository="$(cat $project/$target/CVS/Repository)" - # Get Tag if available - if [ -f $project/$target/CVS/Tag ]; then - branch="$(egrep '^N' $project/$target/CVS/Tag | sed 's/^N//')" + # Get branch if available + if [ -f "$project/$target/CVS/Tag" ]; then +# branch="$(egrep '^N' $project/$target/CVS/Tag | sed 's/^N//')" + branch="$(egrep '^T' $project/$target/CVS/Tag | sed 's/^T//')" fi tar_excludes="$tar_excludes --exclude CVSROOT --exclude .cvsignore" fi @@ -106,8 +107,6 @@ for project in $projects; do echo " ** Building changelog of $versys project \"$project\" target \"$target\"${repository:+ (repository \"$repository\"${branch:+ branch \"$branch\"})}" case $versys in CVS) -# ( cd $project/$target && cvs2cl --gmt -S --no-wrap -f ../$target.ChangeLog 2>&1 || exit 1 ) \ -# ( cd $project/$target && cvs2cl --gmt -S --no-wrap ${branch:+-F $branch} -f ../$target.ChangeLog 2>&1 || exit 1 ) \ ( cd $project/$target && cvs2cl --gmt -S --no-wrap -F ${branch:-TRUNK} -f ../$target.ChangeLog 2>&1 || exit 1 ) \ | egrep -v '^cvs(pserver)? (server|log): Logging' || [ $? -lt 2 ] # catch grep failures ;; |