kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-10 17:30:11 +01:00
Code Activity

Merge branch 'walk-straight' into 'master'

Browse Source 
Correct traversing cibase

See merge request fdroid/fdroidserver!1519
This commit is contained in:
Hans-Christoph Steiner 2024-09-08 18:16:07 +00:00
commit adf9dcb93e
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fdroidserver/nightly.py
View File

@ -438,17 +438,12 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base,
) )
for root, dirs, files in os.walk(cibase): for root, dirs, files in os.walk(cibase):
if root.startswith(repo_basedir): for d in ('.git', '.gradle'):
logging.error( if d in dirs:
_('Broken dirs.remove(d): {root} is part of {repo_basedir} and should not be scanned').format(
root=root,
repo_basedir=repo_basedir
)
)
continue
for d in dirs:
if d == '.git' or d == '.gradle' or (d == 'fdroid' and root == cibase):
dirs.remove(d) dirs.remove(d)
if root == cibase and 'fdroid' in dirs:
dirs.remove('fdroid')
for f in files: for f in files:
if f.endswith('-debug.apk'): if f.endswith('-debug.apk'):
apkfilename = os.path.join(root, f) apkfilename = os.path.join(root, f)