Check for name/CVS dir when looking for sticky name. Old test failed if under name...

Changed files:
    builder.sh -> 1.673

diff --git a/builder.sh b/builder.sh
index 00be8fa2fe8f9b5b5e843d68d1fd823b39abdbed..6600290f804be2efbc75d4d0283b10de4dbf59ed 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -2463,7 +2463,7 @@ while [ $# -gt 0 ]; do
        esac
 done
 
-[ -d "$ASSUMED_NAME" ] && CVS_ENTRIES="$ASSUMED_NAME/CVS/Entries" || CVS_ENTRIES="CVS/Entries"
+[ -d "$ASSUMED_NAME/CVS" ] && CVS_ENTRIES="$ASSUMED_NAME/CVS/Entries" || CVS_ENTRIES="CVS/Entries"
 if [ -f "$CVS_ENTRIES" ] && [ -z "$CVSTAG" ]; then
        CVSTAG=$(awk -vSPECFILE=$(basename $SPECFILE) -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' ${CVS_ENTRIES})
        if [ "$CVSTAG" ]; then