diff options
Diffstat (limited to 'app-admin/calamares/files/calamares-dont-run-locale-gen.patch')
| -rw-r--r-- | app-admin/calamares/files/calamares-dont-run-locale-gen.patch | 52 |
1 files changed, 17 insertions, 35 deletions
diff --git a/app-admin/calamares/files/calamares-dont-run-locale-gen.patch b/app-admin/calamares/files/calamares-dont-run-locale-gen.patch index 29ca6a61..03314b12 100644 --- a/app-admin/calamares/files/calamares-dont-run-locale-gen.patch +++ b/app-admin/calamares/files/calamares-dont-run-locale-gen.patch @@ -1,42 +1,24 @@ diff -Nur a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py ---- a/src/modules/localecfg/main.py 2017-11-14 15:18:58.000000000 +0000 -+++ b/src/modules/localecfg/main.py 2017-11-20 18:56:23.801595116 +0000 -@@ -47,38 +47,6 @@ - - install_path = libcalamares.globalstorage.value("rootMountPoint") +--- a/src/modules/localecfg/main.py 2020-05-11 19:53:23.000000000 +0100 ++++ b/src/modules/localecfg/main.py 2020-05-21 16:11:50.013845904 +0100 +@@ -149,20 +149,6 @@ + target_locale_conf_path = "{!s}/etc/locale.conf".format(install_path) + target_etc_default_path = "{!s}/etc/default".format(install_path) - # restore backup if available -- if os.path.exists('/etc/locale.gen.bak'): -- shutil.copy2("{!s}/etc/locale.gen.bak".format(install_path), -- "{!s}/etc/locale.gen".format(install_path)) -- -- # run locale-gen if detected +- if os.path.exists(target_locale_gen_bak): +- shutil.copy2(target_locale_gen_bak, target_locale_gen) +- libcalamares.utils.debug("Restored backup {!s} -> {!s}" +- .format(target_locale_gen_bak, target_locale_gen)) +- +- # run locale-gen if detected; this *will* cause an exception +- # if the live system has locale.gen, but the target does not: +- # in that case, fix your installation filesystem. - if os.path.exists('/etc/locale.gen'): -- text = [] -- -- with open("{!s}/etc/locale.gen".format(install_path), "r") as gen: -- text = gen.readlines() -- -- # we want unique values, so locale_values should have 1 or 2 items -- locale_values = set(locale_conf.values()) -- -- with open("{!s}/etc/locale.gen".format(install_path), "w") as gen: -- for line in text: -- # always enable en_US -- if en_us_locale in line and line[0] == "#": -- # uncomment line -- line = line[1:].lstrip() -- -- for locale_value in locale_values: -- if locale_value in line and line[0] == "#": -- # uncomment line -- line = line[1:].lstrip() -- -- gen.write(line) -- +- rewrite_locale_gen(target_locale_gen, target_locale_gen, locale_conf) - libcalamares.utils.target_env_call(['locale-gen']) -- print('locale.gen done') +- libcalamares.utils.debug('{!s} done'.format(target_locale_gen)) - # write /etc/locale.conf - locale_conf_path = os.path.join(install_path, "etc/locale.conf") - with open(locale_conf_path, "w") as lcf: + with open(target_locale_conf_path, "w") as lcf: + for k, v in locale_conf.items(): |