napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[networkcfg] NetworkManager files are UTF-8 encoded

Browse Source 
The filenames don't matter, but the contents of the file are also
UTF-8, and depending on the default encoding of the Python
interpreter, this can fail on non-ASCII characters in the
file. Set the encoding explicitly while reading and writing
the NetworkManager configuration files.

FIXES #1848
This commit is contained in:
Adriaan de Groot 2021-12-11 15:12:51 +01:00
parent db86c24638
commit 132ebd2c2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/networkcfg/main.py
View File

@ -73,12 +73,12 @@ def replace_username(nm_config_filename, live_user, target_user):
if not os.path.exists(nm_config_filename): if not os.path.exists(nm_config_filename):
return return
with open(nm_config_filename, "r") as network_conf: with open(nm_config_filename, "r", encoding="UTF-8") as network_conf:
text = network_conf.readlines() text = network_conf.readlines()
live_permissions = 'permissions=user:{}:;'.format(live_user) live_permissions = 'permissions=user:{}:;'.format(live_user)
target_permissions = 'permissions=user:{}:;\n'.format(target_user) target_permissions = 'permissions=user:{}:;\n'.format(target_user)
with open(nm_config_filename, "w") as network_conf: with open(nm_config_filename, "w", encoding="UTF-8") as network_conf:
for line in text: for line in text:
if live_permissions in line: if live_permissions in line:
line = target_permissions line = target_permissions