SPECS: builder - -debug is invalid arg for rpm binary, while it's ...

[glen]

Author: glen                         Date: Fri Mar  3 10:37:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- -debug is invalid arg for rpm binary, while it's ok for rpmbuild

---- Files affected:
SPECS:
   builder (1.410 -> 1.411) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.410 SPECS/builder:1.411
--- SPECS/builder:1.410	Fri Mar  3 11:29:24 2006
+++ SPECS/builder	Fri Mar  3 11:37:05 2006
@@ -61,6 +61,7 @@
 CHMOD="no"
 CHMOD_MODE="0444"
 RPMOPTS=""
+RPMBUILDOPTS=""
 BCOND=""
 GROUP_BCONDS="no"
 CVSIGNORE_DF="no"
@@ -1058,7 +1059,7 @@
 			echo "LASTLOG=$LOG" > $LASTLOG_FILE
 		fi
 		RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM
-		(time eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+		(time eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
 		RETVAL=`cat $RES_FILE`
 		rm $RES_FILE
 		if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
@@ -1069,7 +1070,7 @@
 			fi
 		fi
 	else
-		eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $TARGET_SWITCH $SPECFILE
+		eval nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND $TARGET_SWITCH $SPECFILE
 		RETVAL=$?
 	fi
 	if [ "$RETVAL" -ne "0" ]; then
@@ -1799,7 +1800,7 @@
 			RPMOPTS="${RPMOPTS} --nodeps"
 			;;
 		-debug)
-			RPMOPTS="${RPMOPTS} -debug"; shift ;;
+			RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift ;;
 		* )
 			SPECFILE="${1}"
 			# check if specname was passed as specname:cvstag
================================================================

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