kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 19:10:11 +01:00
Code Activity

Merge branch 'ipfs-cid' into 'master'

Browse Source 
Only check for ipfs_cid when doing fdroid update

See merge request fdroid/fdroidserver!1503
This commit is contained in:
Hans-Christoph Steiner 2024-09-25 10:57:55 +00:00
commit ba91b71d60
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdroidserver/common.py
View File

@ -366,7 +366,8 @@ def fill_config_defaults(thisconfig):
if 'ipfs_cid' not in thisconfig and shutil.which('ipfs_cid'): if 'ipfs_cid' not in thisconfig and shutil.which('ipfs_cid'):
thisconfig['ipfs_cid'] = shutil.which('ipfs_cid') thisconfig['ipfs_cid'] = shutil.which('ipfs_cid')
if not thisconfig.get('ipfs_cid'): cmd = sys.argv[1] if len(sys.argv) >= 2 else ''
if cmd == 'update' and not thisconfig.get('ipfs_cid'):
logging.debug(_("ipfs_cid not found, skipping CIDv1 generation")) logging.debug(_("ipfs_cid not found, skipping CIDv1 generation"))
for k in ['ndk_paths', 'java_paths']: for k in ['ndk_paths', 'java_paths']: