From 9962074cf359eb3dbd1c0444c88777226e2f274f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 13 Mar 2014 10:31:22 +0100 Subject: [PATCH] Also strip project.properties of ant keysigning options --- fdroidserver/common.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 83cf4238..7f7f9cfa 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1442,7 +1442,12 @@ def remove_signing_keys(build_dir): logging.info("Cleaned build.gradle of keysigning configs at %s" % path) - for propfile in ('build.properties', 'default.properties', 'ant.properties'): + for propfile in [ + 'project.properties', + 'build.properties', + 'default.properties', + 'ant.properties', + ]: if propfile in files: path = os.path.join(root, propfile) @@ -1451,8 +1456,11 @@ def remove_signing_keys(build_dir): with open(path, "w") as o: for line in lines: - if not line.startswith('key.store'): - o.write(line) + if line.startswith('key.store'): + continue + if line.startswith('key.alias'): + continue + o.write(line) logging.info("Cleaned %s of keysigning configs at %s" % (propfile,path)) -- 2.30.2