From c2ed538ea4bc031989b4dfcbca041ab1395683d6 Mon Sep 17 00:00:00 2001 From: "Felix C. Stegerman" Date: Tue, 21 Sep 2021 01:13:07 +0200 Subject: [PATCH] copy_triple_t_store_metadata(): handle subdir + flavor --- fdroidserver/update.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index f8b895d8..b0051098 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -1044,7 +1044,13 @@ def copy_triple_t_store_metadata(apps): builds = app.get('Builds', []) gradle_subdirs = set() 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: gradle_subdirs.update(glob.glob(os.path.join('build', packageName, builds[-1].subdir, '*', 'src', '*', 'play'))) if not gradle_subdirs: