From a6549ca548346765b14bc95ff70529babdd5d469 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 14 Dec 2007 16:08:53 +0000 Subject: Preparing a release candidate. --- tests/openpgp/ChangeLog | 5 +++++ tests/openpgp/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog index 07a21357b..ca64d3e18 100644 --- a/tests/openpgp/ChangeLog +++ b/tests/openpgp/ChangeLog @@ -1,3 +1,8 @@ +2007-12-14 Werner Koch + + * Makefile.am (./gpg_dearmor): Reverted last change because the + real fix is to --no-options. + 2007-11-22 Werner Koch * Makefile.am (./gpg_dearmor): Add --homedir so that we don't diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index 3bc6d9cb8..cf32bb9b0 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -61,7 +61,7 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ ./gpg_dearmor: echo '#!/bin/sh' >./gpg_dearmor - echo "../../g10/gpg2 --no-options --no-greeting --homedir . \ + echo "../../g10/gpg2 --no-options --no-greeting \ --no-secmem-warning --batch --dearmor" >>./gpg_dearmor chmod 755 ./gpg_dearmor -- cgit v1.2.3