Keep sticky even if running builder from package/ dir.

Changed files:
    builder.sh -> 1.584

diff --git a/builder.sh b/builder.sh
index ed7168a2c23f37a59eeb0efcab68c86c91a0d3d6..7c61c34f1c99f97a64e5dd5398b639dd5269aab4 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -2219,8 +2219,9 @@ while [ $# -gt 0 ]; do
        esac
 done
 
-if [ -f CVS/Entries ] && [ -z "$CVSTAG" ]; then
-       CVSTAG=$(awk -vSPECFILE=$(basename ${SPECFILE%.spec}.spec) -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' CVS/Entries)
+[ -d "$ASSUMED_NAME" ] && CVS_ENTRIES="$ASSUMED_NAME/CVS/Entries" || CVS_ENTRIES="CVS/Entries"
+if [ -f "$CVS_ENTRIES" ] && [ -z "$CVSTAG" ]; then
+       CVSTAG=$(awk -vSPECFILE=$(basename ${SPECFILE%.spec}.spec) -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' ${CVS_ENTRIES})
        if [ "$CVSTAG" ]; then
                echo >&2 "builder: Sticky tag $CVSTAG active. Use -r TAGNAME to override."
        fi