kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 00:40:11 +01:00
Code Activity

Fixes to scanignore and relative paths in scans

Browse Source
This commit is contained in:
Daniel Martí 2013-10-16 10:54:11 +02:00
parent 1764173084
commit 7eb8dfedc6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/common.py
View File

@ -1600,11 +1600,12 @@ def scan_source(build_dir, root_dir, thisbuild):
# Path (relative) to the file... # Path (relative) to the file...
fp = os.path.join(r, curfile) fp = os.path.join(r, curfile)
fd = fp[len(build_dir)+1:]
# Check if this file has been explicitly excluded from scanning... # Check if this file has been explicitly excluded from scanning...
ignorethis = False ignorethis = False
for i in ignore: for i in ignore:
if fp.startswith(i): if fd.startswith(i):
ignorethis = True ignorethis = True
break break
if ignorethis: if ignorethis:
@ -1616,11 +1617,11 @@ def scan_source(build_dir, root_dir, thisbuild):
mime = m.id_filename(fp) mime = m.id_filename(fp)
if mime == 'application/x-sharedlib': if mime == 'application/x-sharedlib':
problems.append('Found shared library at ' + fp) problems.append('Found shared library at %s (%s)' % (fd, fp))
elif mime == 'application/octet-stream': elif mime == 'application/octet-stream':
problems.append('Found binary at ' + fp) problems.append('Found binary at %s (%s)' % (fd, fp))
elif mime == 'application/vnd.android.package-archive' or fp.endswith('.apk'): elif mime == 'application/vnd.android.package-archive' or fp.endswith('.apk'):
problems.append('Found apk at ' + fp) problems.append('Found apk at %s (%s)' % (fd, fp))
elif curfile.endswith('.java'): elif curfile.endswith('.java'):
for line in file(fp): for line in file(fp):