mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitorious.org:f-droid/fdroidserver

Browse source
This commit is contained in:
Ciaran Gultnieks 2014-01-16 10:18:10 +00:00
commit 66e540772f
4 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fdroidserver/common.py
View file

@ -1440,6 +1440,10 @@ def FDroidPopen(commands, cwd=None):
return result
def remove_signing_keys(build_dir):
comment = re.compile(r'[ ]*//')
signing_configs = re.compile(r'[\t ]*signingConfigs[ \t]*{[ \t]*$')
r_open = re.compile(r'.*{[\t ]*$')
r_close = re.compile(r'.*}[\t ]*$')
for root, dirs, files in os.walk(build_dir):
if 'build.gradle' in files:
path = os.path.join(root, 'build.gradle')
@ -1451,14 +1455,16 @@ def remove_signing_keys(build_dir):
opened = 0
with open(path, "w") as o:
for line in lines:
if 'signingConfigs ' in line:
if comment.match(line):
pass
elif signing_configs.match(line):
opened = 1
changed = True
elif opened > 0:
if '{' in line:
if r_open.match(line):
opened += 1
elif '}' in line:
opened -=1
elif r_close.match(line):
opened -= 1
elif any(s in line for s in (
' signingConfig ',
'android.signingConfigs.',