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

Merge branch 'fix/duplicated-sign' into 'master'

fix(nightly): workaround for broken os.walk and more logging

See merge request fdroid/fdroidserver!1512
This commit is contained in:
Hans-Christoph Steiner 2024-08-30 10:22:55 +00:00
commit 9684eade0d

View File

@ -430,7 +430,22 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base,
config = common.read_config()
common.assert_config_keystore(config)
logging.debug(
_('Run over {cibase} to find -debug.apk. and skip repo_basedir {repo_basedir}').format(
cibase=cibase,
repo_basedir=repo_basedir
)
)
for root, dirs, files in os.walk(cibase):
if root.startswith(repo_basedir):
logging.error(
_('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)