svn commit: r398788 - /spamassassin/trunk/sa-update.raw

[fe...@apache.org]

Author: felicity
Date: Mon May  1 20:30:53 2006
New Revision: 398788

URL: http://svn.apache.org/viewcvs?rev=398788&view=rev
Log:
bug 4863: don't try to create the gpg home directory if it already exists

Modified:
    spamassassin/trunk/sa-update.raw

Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/sa-update.raw?rev=398788&r1=398787&r2=398788&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Mon May  1 20:30:53 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);
 }