You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2006/08/20 20:50:50 UTC

svn commit: r433008 - /spamassassin/branches/3.1/sa-update.raw

Author: felicity
Date: Sun Aug 20 11:50:49 2006
New Revision: 433008

URL: http://svn.apache.org/viewvc?rev=433008&view=rev
Log:
bug 5027: remove invalid warning when trying to channel cf/pre files if the files didn't exist already

Modified:
    spamassassin/branches/3.1/sa-update.raw

Modified: spamassassin/branches/3.1/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/sa-update.raw?rev=433008&r1=433007&r2=433008&view=diff
==============================================================================
--- spamassassin/branches/3.1/sa-update.raw (original)
+++ spamassassin/branches/3.1/sa-update.raw Sun Aug 20 11:50:49 2006
@@ -687,11 +687,11 @@
     # blown away the old ruleset.
     dbg("channel: point of no return for existing $UPDDir");
 
-    # clean out the previous channel files
-    if (! unlink $PREFile ) {
+    # clean out the previous channel files, if they exist
+    if (-f $PREFile && ! unlink $PREFile ) {
       warn("channel: attempt to rm channel pre file failed, attempting to continue anyway");
     }
-    if (! unlink $CFFile ) {
+    if (-f $CFFile && ! unlink $CFFile ) {
       warn("channel: attempt to rm channel cf file failed, attempting to continue anyway");
     }
     if (!clean_update_dir($UPDDir)) {