Changeset 2b80754 in mod_gnutls for test/test_ca.mk

Timestamp:

May 27, 2016, 8:33:01 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

086cea9

Parents:

9e56602

git-author:

Thomas Klute <thomas2.klute@…> (05/27/16 19:35:20)

git-committer:

Thomas Klute <thomas2.klute@…> (05/27/16 20:33:01)

Message:

Delete target files before exporting PGP certificates

GnuPG promts or (with --batch) fails if the target file exists.

File:

• test/test_ca.mk (modified) (2 diffs)

test/test_ca.mk

@@ -35 +35 @@
 
 %/minimal.pgp: %/gpg.conf
+        if test -r $@; then rm $@; fi
         GNUPGHOME=$(dir $@) gpg --output $@ --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
 
@@ -40 +41 @@
 # conditions with parallel make. Locking avoids this problem.
 %/cert.pgp: %/minimal.pgp authority/gpg.conf
+        if test -r $@; then rm $@; fi
         GNUPGHOME=authority $(GPG_FLOCK) gpg --import $<
         GNUPGHOME=authority $(GPG_FLOCK) gpg --batch --sign-key --no-tty --yes "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"