Projet

Général

Profil

« Précédent | Suivant » 

Révision ea181176

Ajouté par Ermal il y a environ 10 ans

Check that the timestamp files are not older than half an hour before usage to avoid worng labeling or timestamp

Voir les différences:

builder_scripts/builder_defaults.sh
239 239

  
240 240
# NOTE: Date string is used for creating file names of images
241 241
#       The file is used for sharing the same value with build_snapshots.sh
242
export _BUILDER_EPOCH=$(date +"%s")
242 243
export DATESTRINGFILE=${DATESTRINGFILE:-$SCRATCHDIR/version.snapshots}
243 244
if [ "${DATESTRING}" = "" ]; then
244 245
	if [ -f $DATESTRINGFILE ]; then
245
		export DATESTRING=`cat $DATESTRINGFILE`
246
		# If the file is more than 30 minutes old regenerate it
247
		TMPDATESTRINGFILE=$(($_BUILDER_EPOCH - `stat -f %m $DATESTRINGFILE`))
248
		if [ $TMPDATESTRINGFILE -gt 1800 ]; then
249
			export DATESTRING=`date "+%Y%m%d-%H%M"`
250
		else
251
			export DATESTRING=`cat $DATESTRINGFILE`
252
		fi
253
		unset TMPDATESTRINGFILE
246 254
	else
247 255
		export DATESTRING=`date "+%Y%m%d-%H%M"`
248
		echo "$DATESTRING" > $DATESTRINGFILE
249 256
	fi
257
	echo "$DATESTRING" > $DATESTRINGFILE
250 258
fi
251 259

  
252 260
# NOTE: Date string is placed on the final image etc folder to help detect new updates
......
254 262
export BUILTDATESTRINGFILE=${BUILTDATESTRINGFILE:-$SCRATCHDIR/version.buildtime}
255 263
if [ "${BUILTDATESTRING}" = "" ]; then
256 264
	if [ -f $BUILTDATESTRINGFILE ]; then
257
		export BUILTDATESTRING=`cat $BUILTDATESTRINGFILE`
265
		# If the file is more than 30 minutes old regenerate it
266
		TMPBUILTDATESTRINGFILE=$(($_BUILDER_EPOCH - `stat -f %m $BUILTDATESTRINGFILE`))
267
		if [ $TMPDATESTRINGFILE -gt 1800 ]; then
268
			export BUILTDATESTRING=`date "+%Y%m%d-%H%M"`
269
		else
270
			export BUILTDATESTRING=`cat $BUILTDATESTRINGFILE`
271
		fi
272
		unset TMPDATESTRINGFILE
258 273
	else
259 274
		export BUILTDATESTRING=`date "+%a %b %d %T %Z %Y"`
260
		echo "$BUILTDATESTRING" > $BUILTDATESTRINGFILE
261 275
	fi
276
	echo "$BUILTDATESTRING" > $BUILTDATESTRINGFILE
262 277
fi
263 278

  
264 279
# General builder output filenames

Formats disponibles : Unified diff