summaryrefslogtreecommitdiff
path: root/app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-11-20 19:02:04 +0000
committerV3n3RiX <venerix@redcorelinux.org>2017-11-20 19:02:04 +0000
commit36ec1121ea2f7dd91657aa36af958f4b42718211 (patch)
tree5963dd061711582809ec988eda13c94e23844692 /app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch
parentf4aece8025da3e7f50f04e97c70f3b2299bf1fae (diff)
app-admin/calamares : revision bump
Diffstat (limited to 'app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch')
-rw-r--r--app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch b/app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch
new file mode 100644
index 00000000..29ca6a61
--- /dev/null
+++ b/app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch
@@ -0,0 +1,42 @@
+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")
+
+- # 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('/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)
+-
+- libcalamares.utils.target_env_call(['locale-gen'])
+- print('locale.gen done')
+-
+ # write /etc/locale.conf
+ locale_conf_path = os.path.join(install_path, "etc/locale.conf")
+ with open(locale_conf_path, "w") as lcf: