mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-08 10:21:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'bug-fixes-for-v0.2.1' of https://gitlab.com/eighthave/fdroidserver

Browse source
This commit is contained in:
Daniel Martí 2014-07-01 18:13:00 +02:00
commit 1a1bdfc3d9
6 changed files with 45 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

17
fdroidserver/update.py
View file

@ -876,11 +876,11 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi
if 'srcname' in apk:
shutil.move(os.path.join(repodir, apk['srcname']),
os.path.join(archivedir, apk['srcname']))
# Move GPG signature too...
sigfile = apk['srcname'] + '.asc'
sigsrc = os.path.join(repodir, sigfile)
if os.path.exists(sigsrc):
shutil.move(sigsrc, os.path.join(archivedir, sigfile))
# Move GPG signature too...
sigfile = apk['srcname'] + '.asc'
sigsrc = os.path.join(repodir, sigfile)
if os.path.exists(sigsrc):
shutil.move(sigsrc, os.path.join(archivedir, sigfile))
archapks.append(apk)
apks.remove(apk)
@ -933,6 +933,13 @@ def main():
resize_all_icons(repodirs)
sys.exit(0)
# check that icons exist now, rather than fail at the end of `fdroid update`
for k in ['repo_icon', 'archive_icon']:
if k in config:
if not os.path.exists(config[k]):
logging.error(k + ' "' + config[k] + '" does not exist! Correct it in config.py.')
sys.exit(1)
# Get all apps...
apps = metadata.read_metadata()