From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 1 Jul 2014 01:47:47 +0000 (-0400)
Subject: only move GPG signature if APK exists
X-Git-Tag: 0.2.1~73^2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d0c767ce5ebb0761ffbc4c137d058921881900ef;p=fdroidserver.git

only move GPG signature if APK exists

The .asc moving code just needed to be indented so it only runs when
'srcname' exists in apk[], otherwise it just throws a KeyError
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 952165b5..18966b46 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)