opensourcemirror
/
fdroid-server
mirror of https://gitlab.com/fdroid/fdroidserver.git
1
0
Fork 0
Code Issues Releases Wiki Activity

win fixes

This commit is contained in:
Gerhard Olsson 2020-01-03 01:24:26 +01:00 committed by Hans-Christoph Steiner
parent 1e1f0db347
commit 0c31c4a5ab
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdroidserver/common.py
View File

@ -557,9 +557,12 @@ def find_sdk_tools_cmd(cmd):
sdk_platform_tools = os.path.join(config['sdk_path'], 'platform-tools')
if os.path.exists(sdk_platform_tools):
tooldirs.append(sdk_platform_tools)
tooldirs.append('/usr/bin')
if os.path.exists('/usr/bin'):
tooldirs.append('/usr/bin')
for d in tooldirs:
path = os.path.join(d, cmd)
if not os.path.isfile(path):
path += '.exe'
if os.path.isfile(path):
if cmd == 'aapt':
test_aapt_version(path)

2
tests/update.TestCase
View File

@ -411,7 +411,7 @@ class UpdateTest(unittest.TestCase):
def javagetsig(self, apkfile):
getsig_dir = 'getsig'
if not os.path.exists(getsig_dir + "/getsig.class"):
if not os.path.exists(os.path.join(getsig_dir, "getsig.class")):
logging.critical("getsig.class not found. To fix: cd '%s' && ./make.sh" % getsig_dir)
sys.exit(1)
# FDroidPopen needs some config to work