From 33b4fd3a209219451b0a6bab987b53636acc7c92 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 19 Apr 2022 08:25:34 +0200 Subject: [PATCH] [localecfg] It's ok to have a missing /etc/locale.gen for reading --- src/modules/localecfg/main.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py index 8f0edcd17..9cf593017 100644 --- a/src/modules/localecfg/main.py +++ b/src/modules/localecfg/main.py @@ -17,6 +17,7 @@ import os import re import shutil + import libcalamares import gettext @@ -71,8 +72,12 @@ def rewrite_locale_gen(srcfilename, destfilename, locale_conf): # Get entire source-file contents text = [] - with open(srcfilename, "r") as gen: - text = gen.readlines() + try: + with open(srcfilename, "r") as gen: + text = gen.readlines() + except FileNotFoundError: + # That's ok, the file doesn't exist so assume empty + pass # we want unique values, so locale_values should have 1 or 2 items locale_values = set(locale_conf.values())