mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'two-fixes' into 'master'

Browse source 
Two fixes

See merge request fdroid/fdroidserver!628
This commit is contained in:
Marcus 2019-02-22 22:00:47 +00:00
commit c912d2e1a8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/index.py
View file

@ -88,7 +88,7 @@ def make(apps, sortedids, apks, repodir, archive):
mirrorcheckfailed = False mirrorcheckfailed = False
mirrors = [] mirrors = []
for mirror in sorted(common.config.get('mirrors', [])): for mirror in common.config.get('mirrors', []):
base = os.path.basename(urllib.parse.urlparse(mirror).path.rstrip('/')) base = os.path.basename(urllib.parse.urlparse(mirror).path.rstrip('/'))
if common.config.get('nonstandardwebroot') is not True and base != 'fdroid': if common.config.get('nonstandardwebroot') is not True and base != 'fdroid':
logging.error(_("mirror '%s' does not end with 'fdroid'!") % mirror) logging.error(_("mirror '%s' does not end with 'fdroid'!") % mirror)

4
fdroidserver/nightly.py
View file

@ -249,8 +249,8 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base,
common.assert_config_keystore(config) common.assert_config_keystore(config)
for root, dirs, files in os.walk(cibase): for root, dirs, files in os.walk(cibase):
for d in ('fdroid', '.git', '.gradle'): for d in dirs:
if d in dirs: if d == '.git' or d == '.gradle' or (d == 'fdroid' and root == cibase):
dirs.remove(d) dirs.remove(d)
for f in files: for f in files:
if f.endswith('-debug.apk'): if f.endswith('-debug.apk'):