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

the first character must be a comment

Browse Source 
to original code would match both lines:
zen_US.UTF-8 UTF-8
#en_US.UTF-8 UTF-8

introducing "#" should check only the commented lines
This commit is contained in:
AlmAck 2018-03-03 14:30:08 +01:00 committed by Philip
parent e7e4a8d783
commit 9d1c3e2669
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/localecfg/main.py
View File

@ -65,15 +65,12 @@ def run():
with open("{!s}/etc/locale.gen".format(install_path), "w") as gen: with open("{!s}/etc/locale.gen".format(install_path), "w") as gen:
for line in text: for line in text:
# always enable en_US # always enable en_US
if line.startswith(en_us_locale, 1): if line.startswith("#" + en_us_locale):
# uncomment line # uncomment line
line = line[1:].lstrip() line = line[1:].lstrip()
for locale_value in locale_values: for locale_value in locale_values:
# check the locale value starting from if line.startswith("#" + locale_value):
# the second index because we expect that
# the first one is a '#'
if line.startswith(locale_value, 1):
# uncomment line # uncomment line
line = line[1:].lstrip() line = line[1:].lstrip()