SPECS: builder - let "./builder ./arts.spec" detect also sticky cv...

glen glen at pld-linux.org
Fri Feb 15 20:01:37 CET 2008


Author: glen                         Date: Fri Feb 15 19:01:37 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- let "./builder ./arts.spec" detect also sticky cvs branch

---- Files affected:
SPECS:
   builder (1.536 -> 1.537) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.536 SPECS/builder:1.537
--- SPECS/builder:1.536	Wed Feb 13 21:45:12 2008
+++ SPECS/builder	Fri Feb 15 20:01:31 2008
@@ -2195,10 +2195,10 @@
 		-debug)
 			RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift
 			;;
-		-* )
+		-*)
 			Exit_error err_invalid_cmdline "$1"
 			;;
-		* )
+		*)
 			SPECFILE="${1}"
 			# check if specname was passed as specname:cvstag
 			if [ "${SPECFILE##*:}" != "${SPECFILE}" ]; then
@@ -2211,7 +2211,7 @@
 done
 
 if [ -f CVS/Entries ] && [ -z "$CVSTAG" ]; then
-	CVSTAG=$(awk -vSPECFILE="${SPECFILE%.spec}.spec" -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' CVS/Entries)
+	CVSTAG=$(awk -vSPECFILE=$(basename ${SPECFILE%.spec}.spec) -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' CVS/Entries)
 	if [ "$CVSTAG" ]; then
 		echo >&2 "builder: Stick tag $CVSTAG active. Use -r TAGNAME to override."
 	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/builder?r1=1.536&r2=1.537&f=u



More information about the pld-cvs-commit mailing list