From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 11 Jan 2018 19:55:36 +0000 (+0100)
Subject: jenkins-test: ensure gpg is starting from a clean and proper place
X-Git-Tag: 1.0.1~40
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ee894688186056296d49d9cd12a85346983c825e;p=fdroidserver.git

jenkins-test: ensure gpg is starting from a clean and proper place

There have been frequent failures on import, some bugs suggest that it
might be because these dirs are missing.  They would get wiped by a
`git clean -fdx`.
---

diff --git a/jenkins-test b/jenkins-test
index 245cbaa6..646b0a62 100755
--- a/jenkins-test
+++ b/jenkins-test
@@ -38,6 +38,10 @@ rm -f config.py keystore.jks
 ../fdroid update
 
 export GNUPGHOME=$WORKSPACE/tests/gnupghome
+if [ ! -e $GNUPGHOME/private-keys-v1.d ]; then
+    mkdir -p $GNUPGHOME/private-keys-v1.d
+    chmod 0700 $GNUPGHOME/private-keys-v1.d
+fi
 gpg --import $GNUPGHOME/secring.gpg
 
 echo "build_server_always = True" >> config.py