SPECS: builder - new option: -cf | -cvs-force

[adamg]

Author: adamg                        Date: Fri Jun  2 20:04:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new option: -cf | -cvs-force

---- Files affected:
SPECS:
   builder (1.440 -> 1.441) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.440 SPECS/builder:1.441
--- SPECS/builder:1.440	Fri Jun  2 21:48:55 2006
+++ SPECS/builder	Fri Jun  2 22:04:27 2006
@@ -79,6 +79,7 @@
 
 CVSTAG=""
 RES_FILE=""
+CVS_FORCE=""
 
 CVS_SERVER="cvs.pld-linux.org"
 DISTFILES_SERVER="://distfiles.pld-linux.org"
@@ -189,10 +190,9 @@
 	if [ -n "$DEBUG" ]; then set -xv; fi
 	echo "\
 Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
-
 [-bb|--build-binary] [-bs|--build-source] [-u|--try-upgrade]
-[{-B|--branch} <branch>] [{-d|--cvsroot} <cvsroot>] [-g|--get]
-[-h|--help] [--http] [{-l,--logtofile} <logfile>] [-m|--mr-proper]
+[{-cf|--cvs-force}] [{-B|--branch} <branch>] [{-d|--cvsroot} <cvsroot>] 
+[-g|--get] [-h|--help] [--http] [{-l,--logtofile} <logfile>] [-m|--mr-proper]
 [-q|--quiet] [--date <yyyy-mm-dd> [-r <cvstag>] [{-T--tag <cvstag>]
 [-Tvs|--tag-version-stable] [-Ts|--tag-stable] [-Tv|--tag-version]
 [{-Tp|--tag-prefix} <prefix>] [{-tt|--test-tag}]
@@ -219,6 +219,7 @@
 -B, --branch        - add branch
 -c, --clean         - clean all temporarily created files (in BUILD, SOURCES,
                       SPECS and \$RPM_BUILD_ROOT),
+-cf, --cvs-force	- use -F when tagging (useful when moving branches)
 -d <cvsroot>, --cvsroot <cvsroot>
                     - setup \$CVSROOT,
 --define <macro> <value>
@@ -1035,7 +1036,7 @@
 		echo "CVS tag: $TAG"
 	fi
 
-	local OPTIONS="tag -F"
+	local OPTIONS="tag $CVS_FORCE"
 	if [ -n "$CVSROOT" ]; then
 		OPTIONS="-d $CVSROOT $OPTIONS"
 	fi
@@ -1090,7 +1091,7 @@
 
 	if [ $# -gt 0 ]; then
 
-		local OPTIONS="tag -b"
+		local OPTIONS="tag $CVS_FORCE -b"
 		if [ -n "$CVSROOT" ]; then
 			OPTIONS="-d $CVSROOT $OPTIONS"
 		fi
@@ -1745,6 +1746,8 @@
 			COMMAND="branch"; shift; TAG="${1}"; shift;;
 		-c | --clean )
 			CLEAN="--clean --rmspec --rmsource"; shift ;;
+		-cf | --cvs-force )
+			CVS_FORCE="-F"; shift;;
 		-d | --cvsroot )
 			shift; CVSROOT="${1}"; shift ;;
 		-g | --get )
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.440&r2=1.441&f=u