diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 9 | ||||
| -rw-r--r-- | tests/gpg/Makefile.am | 5 | ||||
| -rwxr-xr-x | tests/gpg/mkdemodirs.in | 4 | ||||
| -rw-r--r-- | tests/gpg/t-edit.c | 4 |
4 files changed, 16 insertions, 6 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 154de99d..a727a891 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,12 @@ +2009-06-09 Werner Koch <[email protected]> + + * gpg/Makefile.am (./pubring.gpg): Ignore errors in case of + already imported keys. Add --no-permission-warning and remove + obsolete --allow-secret-key-import. + * gpg/mkdemodirs.in (GPG): Add --no-permission-warning. + + * gpg/t-edit.c (edit_fnc): Use gpgme_io_write. + 2009-04-19 Moritz <[email protected]> * gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in. diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index 57e53132..5da0bbbf 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -63,8 +63,9 @@ clean-local: all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf ./pubring.gpg: $(srcdir)/pubdemo.asc ./Alpha/Secret.gpg - $(GPG) --homedir . --import $(srcdir)/pubdemo.asc - $(GPG) --homedir . --allow-secret-key-import \ + -$(GPG) --homedir . --no-permission-warning \ + --import $(srcdir)/pubdemo.asc + -$(GPG) --homedir . --no-permission-warning \ --import Alpha/Secret.gpg Zulu/Secret.gpg ./Alpha/Secret.gpg: mkdemodirs secdemo.asc diff --git a/tests/gpg/mkdemodirs.in b/tests/gpg/mkdemodirs.in index 653c91f4..2299e114 100755 --- a/tests/gpg/mkdemodirs.in +++ b/tests/gpg/mkdemodirs.in @@ -19,7 +19,7 @@ set -e -GPG="@GPG@ --batch --quiet --no-secmem-warning" +GPG="@GPG@ --batch --quiet --no-secmem-warning --no-permission-warning" NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo Sierra Tango Uniform Victor Whisky XRay Yankee Zulu' @@ -45,7 +45,7 @@ for name in $NAMES; do [ -d $name ] && rm -r $name mkdir $name $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg - $GPG --homedir $name --allow-secret-key-import --import $name/Secret.gpg + $GPG --homedir $name --import $name/Secret.gpg $GPGDEMO --export -o - $name > $name/Public.gpg $GPG --homedir $name --import $name/Public.gpg [ -f $name/pubring.gpg~ ] && rm $name/pubring.gpg~ diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c index f2f406de..394379dd 100644 --- a/tests/gpg/t-edit.c +++ b/tests/gpg/t-edit.c @@ -103,8 +103,8 @@ edit_fnc (void *opaque, gpgme_status_code_t status, const char *args, int fd) if (result) { - write (fd, result, strlen (result)); - write (fd, "\n", 1); + gpgme_io_write (fd, result, strlen (result)); + gpgme_io_write (fd, "\n", 1); } return 0; } |