From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 1 Oct 2015 00:04:00 +0000 (-0700)
Subject: Don't use exists() on symlinks
X-Git-Tag: 0.5.0~66
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=712deb4396f8a23f6fcc3c3d2803d2bf510deae1;p=fdroidserver.git

Don't use exists() on symlinks

If they are broken, exists() will return false. islink() will return true in
both cases.
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 29dbad8d..af5340c8 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -911,7 +911,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
                                     app[config['current_version_name_source']])
             apklinkname = sanitized_name + '.apk'
             current_version_path = os.path.join(repodir, current_version_file)
-            if os.path.exists(apklinkname):
+            if os.path.islink(apklinkname):
                 os.remove(apklinkname)
             os.symlink(current_version_path, apklinkname)
             # also symlink gpg signature, if it exists
@@ -919,7 +919,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
                 sigfile_path = current_version_path + extension
                 if os.path.exists(sigfile_path):
                     siglinkname = apklinkname + extension
-                    if os.path.exists(siglinkname):
+                    if os.path.islink(siglinkname):
                         os.remove(siglinkname)
                     os.symlink(sigfile_path, siglinkname)