X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=3ffa065e8afa39deb1eca7560dff10794904dd3f;hp=ab9bdc5594abfe160f75058a61a5d8bb648a0b85;hb=caa03d2733b676199265ab8509d58c188e56d547;hpb=61e045dbf99fefe5f0df962774a095e685a41994

diff --git a/update_spamassassin b/update_spamassassin
index ab9bdc5..3ffa065 100755
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -48,20 +48,23 @@ trap remove_pidfile ERR;
 FAILUREMESSAGE="";
 function report_failure(){
     # Hrm; a previous update failed; don't report again until the file
-    # is removed
-    if [ -e "$SACONFIG/failed_update" ]; then
+    # is removed or it's more than a day old
+    if [ -e "$SACONFIG/failed_update" ] &&
+	[ $(($(date +%s) - $(stat -c '%Y' "$SACONFIG/failed_update"))) -lt 86400 ];  then
+	rm -rf "$TMPDIR"
 	exit 0;
     fi;
-    echo "$FAILUREMESSAGE" >> "$SACONFIG/failed_update"
+    echo "$FAILUREMESSAGE" > "$SACONFIG/failed_update"
     echo "$FAILUREMESSAGE";
     cat - <<EOF;
 
-Update_spamassassin will not report any additional errors until this
-is fixed.
+update_spamassassin will only report this error once a day, and
+updates will not occur until this is fixed.
 
 Please fix the problem and then remove
 $SACONFIG/failed_update
 EOF
+    rm -rf "$TMPDIR"
     exit 1;
 }