mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 07:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

read/write Java .properties files in proper encoding

Browse source 
They are officially defined as always in ISO 8859-1:
https://docs.oracle.com/javase/6/docs/api/java/util/Properties.html
This commit is contained in:
Hans-Christoph Steiner 2016-06-07 13:26:40 +02:00
parent 3eca9dd773
commit 444e8ad982
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fdroidserver/common.py
View file

@ -1017,7 +1017,7 @@ def get_library_references(root_dir):
proppath = os.path.join(root_dir, 'project.properties') proppath = os.path.join(root_dir, 'project.properties')
if not os.path.isfile(proppath): if not os.path.isfile(proppath):
return libraries return libraries
with open(proppath, 'r') as f: with open(proppath, 'r', encoding='iso-8859-1') as f:
for line in f: for line in f:
if not line.startswith('android.library.reference.'): if not line.startswith('android.library.reference.'):
continue continue
@ -1356,7 +1356,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
props = "" props = ""
if os.path.isfile(path): if os.path.isfile(path):
logging.info("Updating local.properties file at %s" % path) logging.info("Updating local.properties file at %s" % path)
with open(path, 'r') as f: with open(path, 'r', encoding='iso-8859-1') as f:
props += f.read() props += f.read()
props += '\n' props += '\n'
else: else:
@ -1378,7 +1378,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
# Add java.encoding if necessary # Add java.encoding if necessary
if build.encoding: if build.encoding:
props += "java.encoding=%s\n" % build.encoding props += "java.encoding=%s\n" % build.encoding
with open(path, 'w') as f: with open(path, 'w', encoding='iso-8859-1') as f:
f.write(props) f.write(props)
flavours = [] flavours = []
@ -1771,12 +1771,12 @@ def remove_signing_keys(build_dir):
if propfile in files: if propfile in files:
path = os.path.join(root, propfile) path = os.path.join(root, propfile)
with open(path, "r") as o: with open(path, "r", encoding='iso-8859-1') as o:
lines = o.readlines() lines = o.readlines()
changed = False changed = False
with open(path, "w") as o: with open(path, "w", encoding='iso-8859-1') as o:
for line in lines: for line in lines:
if any(line.startswith(s) for s in ('key.store', 'key.alias')): if any(line.startswith(s) for s in ('key.store', 'key.alias')):
changed = True changed = True
@ -1838,10 +1838,10 @@ def place_srclib(root_dir, number, libpath):
lines = [] lines = []
if os.path.isfile(proppath): if os.path.isfile(proppath):
with open(proppath, "r") as o: with open(proppath, "r", encoding='iso-8859-1') as o:
lines = o.readlines() lines = o.readlines()
with open(proppath, "w") as o: with open(proppath, "w", encoding='iso-8859-1') as o:
placed = False placed = False
for line in lines: for line in lines:
if line.startswith('android.library.reference.%d=' % number): if line.startswith('android.library.reference.%d=' % number):