Merge branch 'autoname' into 'master'

checkupdates: sort the order of dirs when finding autoname

See merge request fdroid/fdroidserver!1601
This commit is contained in:
Jochen Sprickerhof 2025-02-07 17:26:17 +00:00
commit 6df9d0ecba

View file

@ -381,7 +381,8 @@ def dirs_with_manifest(startdir: str):
A directory that contains a manifest file of an Android project, None if A directory that contains a manifest file of an Android project, None if
no directory could be found no directory could be found
""" """
for root, _dirs, files in os.walk(startdir): for root, dirs, files in os.walk(startdir):
dirs.sort()
if any(m in files for m in [ if any(m in files for m in [
'AndroidManifest.xml', 'pom.xml', 'build.gradle', 'build.gradle.kts']): 'AndroidManifest.xml', 'pom.xml', 'build.gradle', 'build.gradle.kts']):
yield Path(root) yield Path(root)