SPECS: builder - fixed --try-upgrade and md5 update - $UPDATE5 no ...

glen glen at pld-linux.org
Wed Jul 26 21:14:57 CEST 2006


Author: glen                         Date: Wed Jul 26 19:14:57 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed --try-upgrade and md5 update
- $UPDATE5 no longer used in get_files(), so do not pass it

---- Files affected:
SPECS:
   builder (1.449 -> 1.450) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.449 SPECS/builder:1.450
--- SPECS/builder:1.449	Wed Jul 26 20:28:45 2006
+++ SPECS/builder	Wed Jul 26 21:14:52 2006
@@ -93,7 +93,7 @@
 # let get_files skip over files which are present to get those damn files fetched
 SKIP_EXISTING_FILES="no"
 
-TRY_UPGRADE=
+TRY_UPGRADE=""
 # should the specfile be restored if upgrade failed?
 REVERT_BROKEN_UPGRADE="yes"
 
@@ -445,7 +445,7 @@
 		return
 	fi
 
-	rpm_dump_cache="kalasaba" NODIST="yes" UPDATE5= get_files $ICONS
+	rpm_dump_cache="kalasaba" NODIST="yes" get_files $ICONS
 }
 
 parse_spec()
@@ -1147,7 +1147,9 @@
 			eval "perl -pi -e 's/Version:\t"$TOLDVER"/Version:\t"$TNEWVER"/gs' $SPECFILE"
 			eval "perl -pi -e 's/Release:\t[1-9]{0,4}/Release:\t0.1/' $SPECFILE"
 			parse_spec;
-			NODIST="yes" UPDATE5="yes" get_files $SOURCES $PATCHES;
+			NODIST="yes" get_files $SOURCES $PATCHES;
+			UPDATE5="yes" update_md5 $SOURCES
+
 			unset TOLDVER TNEWVER TNOTIFY
 		fi
 	fi
================================================================

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



More information about the pld-cvs-commit mailing list