From a7fd83a384ad2fb10395a3b313443944aa58b05c Mon Sep 17 00:00:00 2001 From: Carlos Nihelton Date: Wed, 16 Feb 2022 22:59:05 -0300 Subject: [PATCH] Fixes missing dir on system_setup integration test By providing alternative directories to find LC_* locale definitions. --- system_setup/server/controllers/configure.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/system_setup/server/controllers/configure.py b/system_setup/server/controllers/configure.py index c7473ae0..5940cb17 100644 --- a/system_setup/server/controllers/configure.py +++ b/system_setup/server/controllers/configure.py @@ -58,8 +58,14 @@ class ConfigureController(SubiquityController): cmdFile = os.path.join(self.model.root, cmd) shutil.copy(os.path.join("/", cmd), cmdFile) # Supply LC_* definition files to avoid complains from localedef. - shutil.copytree("/usr/lib/locale/C.UTF-8/", outDir, - dirs_exist_ok=True) + candidateSourceDirs = ["/usr/lib/locale/C.UTF-8/", + "/usr/lib/locale/C.utf8/"] + sourceDirs = [d for d in candidateSourceDirs if os.path.exists(d)] + if len(sourceDirs) == 0 or sourceDirs is None: + log.error("No available LC_* definitions found in this system") + return ("", False) + + shutil.copytree(sourceDirs[0], outDir, dirs_exist_ok=True) try: # Altering locale-gen script to output to the desired folder. with open(cmdFile, "r+") as f: