From 051905620da5aa0212b98d1429d99c076be268b3 Mon Sep 17 00:00:00 2001 From: "Felix C. Stegerman" Date: Fri, 2 Jul 2021 14:34:34 +0000 Subject: [PATCH] fix copy_triple_t_store_metadata() w/ multiple apps in same repo --- fdroidserver/update.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 52b89116..4601eb81 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -1059,12 +1059,12 @@ def copy_triple_t_store_metadata(apps): if flavor not in ('yes', 'no'): p = os.path.join('build', packageName, gradle_path, 'src', flavor, 'play') gradle_subdirs.add(p) - if not gradle_subdirs: - gradle_subdirs.update(glob.glob(os.path.join('build', packageName, '*', 'src', '*', 'play'))) if not gradle_subdirs and len(app.get('Builds', [])) and app.get('Builds', [])[-1].subdir: gradle_subdirs.update(glob.glob(os.path.join('build', packageName, app.get('Builds', [])[-1].subdir, 'src', '*', 'play'))) + if not gradle_subdirs: + gradle_subdirs.update(glob.glob(os.path.join('build', packageName, '*', 'src', '*', 'play'))) - for d in gradle_subdirs: + for d in sorted(gradle_subdirs): logging.debug('Triple-T Gradle Play Publisher: ' + d) for root, dirs, files in os.walk(d): segments = root.split('/')