From 4dcfa95d6e9ca9ebd1e5d0306f7f774288007447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Tue, 21 Aug 2018 03:05:43 +0200 Subject: [PATCH] fix: jarsigner and keytool lookup regression --- fdroidserver/common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 85b15d70..42aa0d5c 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -236,8 +236,9 @@ def fill_config_defaults(thisconfig): thisconfig['keytool'] = os.path.join(java_home, 'bin', 'keytool') break - if 'jarsigner' not in thisconfig: + if 'jarsigner' not in thisconfig and shutil.which('jarsigner'): thisconfig['jarsigner'] = shutil.which('jarsigner') + if 'keytool' not in thisconfig and shutil.which('keytool'): thisconfig['keytool'] = shutil.which('keytool') for k in ['ndk_paths', 'java_paths']: