/[pkg-listmaster]/trunk/spamassassin_config/update_spamassassin
ViewVC logotype

Diff of /trunk/spamassassin_config/update_spamassassin

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 87 by don, Mon Oct 29 07:21:06 2007 UTC revision 93 by don, Mon Nov 12 05:14:22 2007 UTC
# Line 28  ORIGREV=$(svn info $SACONFIG |awk '/^Rev Line 28  ORIGREV=$(svn info $SACONFIG |awk '/^Rev
28  NEWREV=$(svn info $(svn info $SACONFIG|awk '/^URL:/{print $2}')|awk '/^Revision:/{print $2}')  NEWREV=$(svn info $(svn info $SACONFIG|awk '/^URL:/{print $2}')|awk '/^Revision:/{print $2}')
29    
30  # no changes, bug out.  # no changes, bug out.
31  if [ $ORIGREV -ge $NEWREV ];  if [ $ORIGREV -ge $NEWREV ]; then
32      exit 0;      exit 0;
33  fi;  fi;
34    
# Line 75  if svn status |grep -q '^C'; then Line 75  if svn status |grep -q '^C'; then
75  fi;  fi;
76  cd - >/dev/null 2>&1  cd - >/dev/null 2>&1
77    
78  FAILUREMESSAGE="$(spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint)"  if ! spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_lint 2>&1; then
79  if [ "$?" != "0" ]; then      FAILUREMESSAGE="$(echo -e 'spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n'| cat - $TMPDIR/sa_lint)";
     FAILUREMESSAGE="$(echo -e 'spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n')$FAILUREMESSAGE";  
80      report_failure      report_failure
81  fi;  fi;
82  mv "$SACONFIG" "$BAKDIR/spamassassin_config_r$ORIGREV"  mv "$SACONFIG" "$BAKDIR/spamassassin_config_r$ORIGREV"
83  mv "$TMPDIR/spamassassin_config" "$SACONFIG"  mv "$TMPDIR/spamassassin_config" "$SACONFIG"
84  trap ERR  trap ERR
85    remove_pidfile
86  rm -rf "$TMPDIR"  rm -rf "$TMPDIR"
87    
88  if [ "$HOSTNAME" == "rietz" ]; then  if [ "$HOSTNAME" == "rietz" ]; then
# Line 95  else Line 95  else
95  fi;  fi;
96    
97    
 exit 0;  
98    exit 0;
Legend:
Removed from v.87  
changed lines
  Added in v.93
  ViewVC Help
Powered by ViewVC 1.1.5