From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 8 Mar 2016 23:50:14 +0000 (+0000)
Subject: build: don't remove wrapper dir gradle/
X-Git-Tag: 0.7.0~89
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=261cbcd3ee143ddf9df49fe71243811cf54fd001;p=fdroidserver.git

build: don't remove wrapper dir gradle/

The point of removing these was to make sure that gradlew wasn't used,
and that our gradle was used instead. Removing the scripts already
accomplishes this.

Removing gradle/ should be harmless, but some apps like I2P re-use this
directory to also hold other stuff that is actually needed. So be safer
and don't remove it at all.
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 216de06f..ed131d67 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -557,7 +557,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir,
             # .gradle/ as binary files. To avoid overcomplicating the scanner,
             # manually delete them, just like `gradle clean` should have removed
             # the build/ dirs.
-            del_dirs(['build', '.gradle', 'gradle'])
+            del_dirs(['build', '.gradle'])
             del_files(['gradlew', 'gradlew.bat'])
 
         if 'pom.xml' in files: