From 66414a9fc7096cc6f4a3b5e305400741d05f8df1 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Thu, 26 Nov 2020 22:52:52 +0100 Subject: [PATCH] find_sdk_tools_cmd returns non if aapt is not found --- tests/common.TestCase | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/common.TestCase b/tests/common.TestCase index eff088d6..fc968c0f 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -715,10 +715,9 @@ class CommonTest(unittest.TestCase): fdroidserver.common.fill_config_defaults(config) fdroidserver.common.config = config self._set_build_tools() - try: + aapt = fdroidserver.common.find_sdk_tools_cmd('aapt') + if aapt: config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt') - except fdroidserver.exception.FDroidException: - pass # aapt is not required if androguard is present testcases = [ ('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', '1101613', '0.1'),