From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 22 Sep 2015 20:03:42 +0000 (-0700)
Subject: scanner: skip symlinks to avoid issues
X-Git-Tag: 0.5.0~80
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b589595e45504abd85e1bcdf71a3107eb2104538;p=fdroidserver.git

scanner: skip symlinks to avoid issues

If they resolve to a missing file, we don't care about them. If they resolve
to an existing file, we'll scan that file anyway.
---

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index c26438ad..7f6d7d91 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -140,8 +140,11 @@ def scan_source(build_dir, root_dir, thisbuild):
 
             # Path (relative) to the file
             fp = os.path.join(r, curfile)
-            fd = fp[len(build_dir) + 1:]
 
+            if os.path.islink(fp):
+                continue
+
+            fd = fp[len(build_dir) + 1:]
             ext = common.get_extension(fd)
 
             if ext == 'so':