mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-09-13 22:42:29 +03: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:
commit
9684eade0d
1 changed files with 15 additions and 0 deletions
|
@ -430,7 +430,22 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base,
|
||||||
config = common.read_config()
|
config = common.read_config()
|
||||||
common.assert_config_keystore(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):
|
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:
|
for d in dirs:
|
||||||
if d == '.git' or d == '.gradle' or (d == 'fdroid' and root == cibase):
|
if d == '.git' or d == '.gradle' or (d == 'fdroid' and root == cibase):
|
||||||
dirs.remove(d)
|
dirs.remove(d)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue