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/05/02 05:30:02 UTC
svn commit: r398787 - /spamassassin/branches/3.1/sa-update.raw
Author: felicity
Date: Mon May 1 20:30:00 2006
New Revision: 398787
URL: http://svn.apache.org/viewcvs?rev=398787&view=rev
Log:
bug 4863: don't try to create the gpg home directory if it already exists
Modified:
spamassassin/branches/3.1/sa-update.raw
Modified: spamassassin/branches/3.1/sa-update.raw
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.1/sa-update.raw?rev=398787&r1=398786&r2=398787&view=diff
==============================================================================
--- spamassassin/branches/3.1/sa-update.raw (original)
+++ spamassassin/branches/3.1/sa-update.raw Mon May 1 20:30:00 2006
@@ -1020,8 +1020,10 @@
return unless (-f $defkey);
print "sa-update: importing default keyring to '".$opt{gpghomedir}."'...\n";
- # use 0700 to avoid "unsafe permissions" warning
- mkdir ($opt{gpghomedir}, 0700) or die "cannot mkdir $opt{gpghomedir}";
+ unless (-d $opt{gpghomedir}) {
+ # use 0700 to avoid "unsafe permissions" warning
+ mkdir ($opt{gpghomedir}, 0700) or die "cannot mkdir $opt{gpghomedir}: $!";
+ }
import_gpg_key($defkey);
}