From 1e8093ff6e744a3cbda346031104b3e58c77234e Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sun, 29 Nov 2020 09:26:17 +0100 Subject: [PATCH] Revert "find_sdk_tools_cmd returns non if aapt is not found" This reverts commit 66414a9fc7096cc6f4a3b5e305400741d05f8df1. --- tests/common.TestCase | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/common.TestCase b/tests/common.TestCase index 158f7701..2677c5f7 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -715,9 +715,10 @@ class CommonTest(unittest.TestCase): fdroidserver.common.fill_config_defaults(config) fdroidserver.common.config = config self._set_build_tools() - aapt = fdroidserver.common.find_sdk_tools_cmd('aapt') - if aapt: + try: 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'),