kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

copy_triple_t_store_metadata(): handle subdir + flavor

Browse Source
This commit is contained in:
Felix C. Stegerman 2021-09-21 01:13:07 +02:00
parent 311e6a14f1
commit c2ed538ea4
1 changed files with 7 additions and 1 deletions
Show Stats 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: