TMPDIR=$(mktemp -d);
+HOSTNAME=$(hostname);
+
if [ "$HOSTNAME" = "rietz" ] || [ "$HOSTNAME" = "busoni" ]; then
BASEDIR="/org/bugs.debian.org"
USERCONF="bugs/user_prefs";
SACONFIG="$BASEDIR/spamassassin_config";
BAKDIR="$BASEDIR/spamassassin_config_bak";
+# because alioth continuously fails, make sure that svn info will
+# succeed first before cluttering the log. Ideally we would report
+# this error, but it happens far too frequently, so we bail out here.
+if ! svn info $(svn info $SACONFIG|awk '/^URL:/{print $2}') >/dev/null 2>&1; then
+ exit 0;
+fi;
+
# figure out if there's an update to be made
ORIGREV=$(svn info $SACONFIG |awk '/^Revision:/{print $2}')
NEWREV=$(svn info $(svn info $SACONFIG|awk '/^URL:/{print $2}')|awk '/^Revision:/{print $2}')
echo $$ > "$SACONFIG/.update_spamassassin";
fi;
-function remove_pidfile(){
+remove_pidfile () {
rm "$SACONFIG/.update_spamassassin";
}
-trap remove_pidfile ERR;
+trap remove_pidfile 0;
FAILUREMESSAGE="";
-function report_failure(){
+report_failure () {
# Hrm; a previous update failed; don't report again until the file
# is removed or it's more than a day old
if [ -e "$SACONFIG/failed_update" ] &&