You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2006/07/14 13:59:24 UTC

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

Author: jm
Date: Fri Jul 14 04:59:23 2006
New Revision: 421883

URL: http://svn.apache.org/viewvc?rev=421883&view=rev
Log:
bug 4958: avoid Windows single-quote-phobia

Modified:
    spamassassin/trunk/sa-update.raw

Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?rev=421883&r1=421882&r2=421883&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Fri Jul 14 04:59:23 2006
@@ -1005,8 +1005,14 @@
   my $gpghome = '';
   if ($opt{'gpghomedir'}) {
     $gpghome = $opt{'gpghomedir'};
-    $gpghome =~ s/\'/\\\'/gs;
-    $gpghome = "--homedir='$gpghome'";
+    if (Mail::SpamAssassin::Util::am_running_on_windows()) {
+      # windows is single-quote-phobic; bug 4958 cmt 7
+      $gpghome =~ s/\"/\\\"/gs;
+      $gpghome = "--homedir=\"$gpghome\"";
+    } else {
+      $gpghome =~ s/\'/\\\'/gs;
+      $gpghome = "--homedir='$gpghome'";
+    }
   }
   return $gpghome;
 }