From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 9 Jul 2014 09:11:13 +0000 (+0200)
Subject: Remove some gradle @dir leftovers
X-Git-Tag: 0.2.1~21
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fad659921f957a0be6e7f25c82dbf645ee5141ac;p=fdroidserver.git

Remove some gradle @dir leftovers
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 38c71509..ff1f0583 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1220,7 +1220,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
 
     flavour = None
     if build['type'] == 'gradle':
-        flavour = build['gradle'].split('@')[0]
+        flavour = build['gradle']
         if flavour in ['main', 'yes', '']:
             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):
             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:
             if gradlepluginver:
                 break