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

Merge branch 'triple-t-flavours' into 'master'

Browse source 
copy_triple_t_store_metadata(): handle subdir + flavor

Closes fdroiddata#2487

See merge request fdroid/fdroidserver!1022
This commit is contained in:
Felix C. Stegerman 2021-09-29 21:53:26 +00:00
commit 5b86242dde
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/update.py
View file

@ -1044,7 +1044,13 @@ def copy_triple_t_store_metadata(apps):
builds = app.get('Builds', []) builds = app.get('Builds', [])
gradle_subdirs = set() gradle_subdirs = set()
if builds and builds[-1].subdir: if builds and builds[-1].subdir:
gradle_subdirs.update(glob.glob(os.path.join('build', packageName, builds[-1].subdir, 'src', '*', 'play'))) for flavor in builds[-1].gradle:
if flavor not in ('yes', 'no', True, False):
p = os.path.join('build', packageName, builds[-1].subdir, 'src', flavor, 'play')
if os.path.exists(p):
gradle_subdirs.add(p)
if not gradle_subdirs:
gradle_subdirs.update(glob.glob(os.path.join('build', packageName, builds[-1].subdir, 'src', '*', 'play')))
if not gradle_subdirs: if not gradle_subdirs:
gradle_subdirs.update(glob.glob(os.path.join('build', packageName, builds[-1].subdir, '*', 'src', '*', 'play'))) gradle_subdirs.update(glob.glob(os.path.join('build', packageName, builds[-1].subdir, '*', 'src', '*', 'play')))
if not gradle_subdirs: if not gradle_subdirs: