NEWREV=$(svn info $(svn info $SACONFIG|awk '/^URL:/{print $2}')|awk '/^Revision:/{print $2}')
# no changes, bug out.
-if [ "$ORIGREV" -ge "$NEWREV" ]; then
+if [ "0$ORIGREV" -ge "0$NEWREV" ]; then
exit 0;
fi;
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;
}