mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 07:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove some gradle @dir leftovers

Browse source
This commit is contained in:
Daniel Martí 2014-07-09 11:11:13 +02:00
parent 7b8948f932
commit fad659921f
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/common.py
View file

@ -1220,7 +1220,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
flavour = None flavour = None
if build['type'] == 'gradle': if build['type'] == 'gradle':
flavour = build['gradle'].split('@')[0] flavour = build['gradle']
if flavour in ['main', 'yes', '']: if flavour in ['main', 'yes', '']:
flavour = None flavour = None
@ -1234,13 +1234,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
if parent_dir.startswith(build_dir): if parent_dir.startswith(build_dir):
gradle_files.append(os.path.join(parent_dir, 'build.gradle')) gradle_files.append(os.path.join(parent_dir, 'build.gradle'))
# Gradle execution dir build.gradle
if '@' in build['gradle']:
gradle_file = os.path.join(root_dir, build['gradle'].split('@', 1)[1], 'build.gradle')
gradle_file = os.path.normpath(gradle_file)
if gradle_file not in gradle_files:
gradle_files.append(gradle_file)
for path in gradle_files: for path in gradle_files:
if gradlepluginver: if gradlepluginver:
break break