From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 19 Jun 2014 10:32:21 +0000 (+0200)
Subject: Use gradle_dir, not root_dir, to fetch the plugin version
X-Git-Tag: 0.2~21
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=69da721f021ebd1f479cd8d04af9f25931fae0ca;p=fdroidserver.git

Use gradle_dir, not root_dir, to fetch the plugin version
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 92e559e1..e83f0d2b 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1145,7 +1145,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
         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:
+            with open(os.path.join(gradle_dir, 'build.gradle')) as f:
                 for line in f:
                     match = version_regex.match(line)
                     if match: