SPECS: builder - $UPDATE5 is no longer needed as update_md5 is fun...

[glen]

Author: glen                         Date: Thu Sep 21 18:54:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- $UPDATE5 is no longer needed as update_md5 is function

---- Files affected:
SPECS:
   builder (1.454 -> 1.455) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.454 SPECS/builder:1.455
--- SPECS/builder:1.454	Tue Aug 22 21:02:30 2006
+++ SPECS/builder	Thu Sep 21 20:54:47 2006
@@ -39,7 +39,6 @@
 NODIST=""
 NOINIT=""
 UPDATE=""
-UPDATE5=""
 ADD5=""
 NO5=""
 ALWAYS_CVSUP=${ALWAYS_CVSUP:-"yes"}
@@ -781,13 +780,11 @@
 	for i in "$@"; do
 		local fp=$(nourl "$i")
 		local srcno=$(src_no "$i")
-		if [ -n "$UPDATE5" ]; then
-			if [ -n "$ADD5" ]; then
-				[ "$fp" = "$i" ] && continue # FIXME what is this check doing?
-				grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE && continue
-			else
-				grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE || continue
-			fi
+		if [ -n "$ADD5" ]; then
+			[ "$fp" = "$i" ] && continue # FIXME what is this check doing?
+			grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE && continue
+		else
+			grep -qiE '^#[ 	]*Source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE || continue
 		fi
 		if [ ! -f "$fp" ] || [ $ALWAYS_CVSUP = "yes" ]; then
 			need_files="$need_files $i"
@@ -803,8 +800,7 @@
 	for i in "$@"; do
 		local fp=$(nourl "$i")
 		local srcno=$(src_no "$i")
-		if [ -n "$UPDATE5" ] && \
-			( ( [ -n "$ADD5" ] && echo $i | grep -q -E 'ftp://|http://|https://' && \
+		if ( ( [ -n "$ADD5" ] && echo $i | grep -q -E 'ftp://|http://|https://' && \
 			[ -z "$(grep -E -i '^NoSource[ 	]*:[ 	]*'$i'([ 	]|$)' $SPECS_DIR/$SPECFILE)" ] ) || \
 			grep -q -i -E '^#[ 	]*source'$srcno'-md5[ 	]*:' $SPECS_DIR/$SPECFILE )
 		then
@@ -1150,7 +1146,7 @@
 			eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t0.1/' $SPECFILE"
 			parse_spec;
 			NODIST="yes" get_files $SOURCES $PATCHES;
-			UPDATE5="yes" update_md5 $SOURCES
+			update_md5 $SOURCES
 
 			unset TOLDVER TNEWVER TNOTIFY
 		fi
@@ -1728,14 +1724,12 @@
 			COMMAND="update_md5";
 			NODIST="yes"
 			NOCVSSPEC="yes"
-			UPDATE5="yes"
 			shift ;;
 		-a5 | --add-md5 )
 			COMMAND="update_md5";
 			NODIST="yes"
 			NOCVS="yes"
 			NOCVSSPEC="yes"
-			UPDATE5="yes"
 			ADD5="yes"
 			shift ;;
 		-n5 | --no-md5 )
@@ -1898,7 +1892,6 @@
 			UPDATE="yes"
 			NOCVSSPEC="yes"
 			NODIST="yes"
-			UPDATE5="yes"
 			shift ;;
 		-Upi | --update-poldek-indexes )
 			UPDATE_POLDEK_INDEXES="yes"
================================================================

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