From 80a8a39f6f9ede01cd14c278d67f87b1ccb7b1f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Wed, 23 Sep 2015 13:02:22 -0700 Subject: [PATCH] build: make sure .gradle/ is removed at clean --- fdroidserver/build.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index b83885e1..82508067 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -543,6 +543,12 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d (app['id'], thisbuild['version']), p.output) for root, dirs, files in os.walk(build_dir): + # Even when running clean, gradle stores task/artifact caches in + # .gradle/ as binary files. To avoid overcomplicating the scanner, + # manually delete them, just like `gradle clean` should have removed + # the build/ dirs. + if '.gradle' in dirs: + shutil.rmtree(os.path.join(root, '.gradle')) # Don't remove possibly necessary 'gradle' dirs if 'gradlew' is not there if 'gradlew' in files: logging.debug("Getting rid of Gradle wrapper stuff in %s" % root) -- 2.30.2