packages: builder Keep sticky even if running builder from package/ dir.

arekm arekm at pld-linux.org
Tue May 26 11:30:20 CEST 2009


Author: arekm                        Date: Tue May 26 09:30:20 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
Keep sticky even if running builder from package/ dir.

---- Files affected:
packages:
   builder (1.583 -> 1.584) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.583 packages/builder:1.584
--- packages/builder:1.583	Tue May 12 09:26:47 2009
+++ packages/builder	Tue May 26 11:30:15 2009
@@ -2219,8 +2219,9 @@
 	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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.583&r2=1.584&f=u



More information about the pld-cvs-commit mailing list