chiark / gitweb /
Fix moving of gpg sigs between repo and archive
authorCiaran Gultnieks <ciaran@ciarang.com>
Tue, 6 Oct 2015 08:32:00 +0000 (08:32 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Tue, 6 Oct 2015 08:32:00 +0000 (08:32 +0000)
fdroidserver/update.py

index af5340c83dbc3538f4d6fd883842cbcf03857625..5156c3124fc330cde9239bf1d436e43d24761b1c 100644 (file)
@@ -1010,9 +1010,9 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi
             for apk in apklist[keepversions:]:
                 logging.info("Moving " + apk['apkname'] + " to archive")
                 move_file(repodir, archivedir, apk['apkname'], False)
+                move_file(repodir, archivedir, apk['apkname'] + '.asc', True)
                 if 'srcname' in apk:
                     move_file(repodir, archivedir, apk['srcname'], False)
-                    move_file(repodir, archivedir, apk['srcname'] + '.asc', True)
                 archapks.append(apk)
                 apks.remove(apk)
         elif len(apks) < keepversions and len(archapks) > 0:
@@ -1022,9 +1022,9 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi
             for apk in archapklist[:required]:
                 logging.info("Moving " + apk['apkname'] + " from archive")
                 move_file(archivedir, repodir, apk['apkname'], False)
+                move_file(archivedir, repodir, apk['apkname'] + '.asc', True)
                 if 'srcname' in apk:
                     move_file(archivedir, repodir, apk['srcname'], False)
-                    move_file(archivedir, repodir, apk['srcname'] + '.asc', True)
                 archapks.remove(apk)
                 apks.append(apk)