From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Thu, 14 Dec 2017 08:50:10 +0000 (+0000)
Subject: Merge branch '428-Signature-key-fingerprint-of-file-stats-publishsigkeys-jar-does... 
X-Git-Tag: 1.0.0~31
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cc0399e740feb45546d42275b04a727b9b36d04a;hp=1f5818020da5632c35df69e808369836e3efb2bd;p=fdroidserver.git

Merge branch '428-Signature-key-fingerprint-of-file-stats-publishsigkeys-jar-does-not-match-repo_key_sha256-in-config-py' into 'master'

jenkins test: clear singing-key-fingerpring from previous run

Closes #428

See merge request fdroid/fdroidserver!410
---

diff --git a/jenkins-test b/jenkins-test
index 74fbba53..c8f9de8a 100755
--- a/jenkins-test
+++ b/jenkins-test
@@ -39,6 +39,7 @@ echo "build_server_always = True" >> config.py
 echo "gpghome = '$GNUPGHOME'" >> config.py
 echo "gpgkey = 'CE71F7FB'" >> config.py
 chmod 0600 config.py
+sed -i '/\s*repo_key_sha256\s*=.*/d' config.py
 
 # publish process when building and signing are on separate machines
 test -d repo || mkdir repo