mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

make cachedir subdirectories pick their place correctly based on parent folder

Browse source
This commit is contained in:
Michael Pöhn 2022-09-29 16:43:52 +02:00
parent 1e6694112a
commit 4a38908bd7
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroidserver/common.py
View file

@ -125,13 +125,11 @@ default_config = {
'sdk_path': "$ANDROID_HOME", 'sdk_path': "$ANDROID_HOME",
'ndk_paths': {}, 'ndk_paths': {},
'cachedir': str(Path.home() / '.cache/fdroidserver'), 'cachedir': str(Path.home() / '.cache/fdroidserver'),
'cachedir_scanner': str(Path.home() / '.cache/fdroidserver/scanner'),
'java_paths': None, 'java_paths': None,
'scan_binary': False, 'scan_binary': False,
'ant': "ant", 'ant': "ant",
'mvn3': "mvn", 'mvn3': "mvn",
'gradle': os.path.join(FDROID_PATH, 'gradlew-fdroid'), 'gradle': os.path.join(FDROID_PATH, 'gradlew-fdroid'),
'gradle_version_dir': str(Path.home() / '.cache/fdroidserver/gradle'),
'sync_from_local_copy_dir': False, 'sync_from_local_copy_dir': False,
'allow_disabled_algorithms': False, 'allow_disabled_algorithms': False,
'per_app_repos': False, 'per_app_repos': False,
@ -320,6 +318,11 @@ def fill_config_defaults(thisconfig):
ndk_paths[ndkdict['release']] = ndk_paths.pop(k) ndk_paths[ndkdict['release']] = ndk_paths.pop(k)
break break
if 'cachedir_scanner' not in thisconfig:
thisconfig['cachedir_scanner'] = str(Path(thisconfig['cachedir']) / 'scanner')
if 'gradle_version_dir' not in thisconfig:
thisconfig['gradle_version_dir'] = str(Path(thisconfig['cachedir']) / 'gradle')
def get_config(options=None): def get_config(options=None):
""" """