FAILUREMESSAGE="$(echo -e 'spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n'| cat - $TMPDIR/sa_lint)";
report_failure
fi;
-cd "$SACONFIG":
+cd "$SACONFIG";
git merge --ff-only --quiet $REMOTE_BRANCH --;
trap - 0
remove_pidfile