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/05/31 00:15:03 UTC

svn commit: r410392 - /spamassassin/branches/3.0/build/update_devel

Author: jm
Date: Tue May 30 15:15:01 2006
New Revision: 410392

URL: http://svn.apache.org/viewvc?rev=410392&view=rev
Log:
backport fix for minotaur changes breaking gpgsign script

Modified:
    spamassassin/branches/3.0/build/update_devel

Modified: spamassassin/branches/3.0/build/update_devel
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.0/build/update_devel?rev=410392&r1=410391&r2=410392&view=diff
==============================================================================
--- spamassassin/branches/3.0/build/update_devel (original)
+++ spamassassin/branches/3.0/build/update_devel Tue May 30 15:15:01 2006
@@ -12,9 +12,6 @@
   echo 1>&2
 fi
 
-GPGSIGN=$SA_GPGSIGN
-test -x "$GPGSIGN" || GPGSIGN=$HOME/sabuildtools/bin/gpgsign
-
 DEVDIR=$WEBDIR/devel
 RELDIR=$WEBDIR/released
 mkdir -p $DEVDIR $RELDIR
@@ -61,8 +58,8 @@
   build/sha1sum.pl $DISTVNAME.$ext > $DEVDIR/$DISTVNAME.$ext.sha1 || exit $?
 
   rm -f $DISTVNAME.$ext.asc*
-  if [ -x "$GPGSIGN" ]; then
-    $GPGSIGN $DISTVNAME.$ext                           || exit $?
+  if [ -d $HOME/sabuildtools/sasigningkey ]; then
+    gpg --homedir $HOME/sabuildtools/sasigningkey -bsa $DISTVNAME.$ext || exit $?
     mv $DISTVNAME.$ext.asc $DEVDIR/$DISTVNAME.$ext.asc || exit $?
   fi
 
@@ -71,8 +68,6 @@
 
 test -f Makefile && make distclean
 rm -f $DISTVNAME.*
-
-# ( cd $DEVDIR && svn add *SpamAssassin* )
 
 chgrp -R spamassassin $DEVDIR $RELDIR
 ls -l $DEVDIR