mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

lintVital was added in 0.8, only exclude it then

Browse source
This commit is contained in:
Daniel Martí 2014-06-12 10:00:46 +02:00
parent 3c08b51dfb
commit 9779979e3a
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
fdroidserver/common.py
View file

@ -30,6 +30,7 @@ import Queue
import threading
import magic
import logging
from distutils.version import LooseVersion
import metadata
@ -1129,6 +1130,27 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
if flavour in ['main', 'yes', '']:
flavour = None
version_regex = re.compile(r".*'com\.android\.tools\.build:gradle:([^\.]+\.[^\.]+).*'.*")
gradlepluginver = None
with open(os.path.join(root_dir, 'build.gradle')) as f:
for line in f:
match = version_regex.match(line)
if match:
gradlepluginver = match.group(1)
break
if '@' in build['gradle'] and not gradlepluginver:
gradle_dir = os.path.join(root_dir, build['gradle'].split('@', 1)[1])
gradle_dir = os.path.normpath(gradle_dir)
with open(os.path.join(root_dir, 'build.gradle')) as f:
for line in f:
match = version_regex.match(line)
if match:
gradlepluginver = match.group(1)
break
build['gradlepluginver'] = LooseVersion(gradlepluginver)
if build['target']:
n = build["target"].split('-')[1]
FDroidPopen(['sed', '-i',