X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=fdroidserver%2Fupdate.py;h=72d268d3b78fc57a7140a36e358360a4c0308c25;hb=1a1bdfc3d9a13cd9526fe2b63be96e33bba40e7b;hp=bff615e43939d11aa3f3dd429aa4fc818d733fbb;hpb=8888962ace654c407d6e3bce476cbfa610a1dbf3;p=fdroidserver.git

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index bff615e4..72d268d3 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -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()