mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 06:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "find_sdk_tools_cmd returns non if aapt is not found"

Browse source 
This reverts commit 66414a9fc7.
This commit is contained in:
Jochen Sprickerhof 2020-11-29 09:26:17 +01:00
parent 2cca336a29
commit 1e8093ff6e
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/common.TestCase
View file

@ -715,9 +715,10 @@ class CommonTest(unittest.TestCase):
fdroidserver.common.fill_config_defaults(config) fdroidserver.common.fill_config_defaults(config)
fdroidserver.common.config = config fdroidserver.common.config = config
self._set_build_tools() self._set_build_tools()
aapt = fdroidserver.common.find_sdk_tools_cmd('aapt') try:
if aapt:
config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt') config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt')
except fdroidserver.exception.FDroidException:
pass # aapt is not required if androguard is present
testcases = [ testcases = [
('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', '1101613', '0.1'), ('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', '1101613', '0.1'),