StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1303 from CarlosNihelton/wsl-locgen-speedup 

[system_setup] Allow skipping locale-gen command
This commit is contained in:
Didier Roche 2022-05-31 14:08:07 +02:00 committed by GitHub
parent ade6f828c9 5a8e2f2835
commit 95bee59dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system_setup/server/controllers/configure.py
View File

@ -101,7 +101,7 @@ class ConfigureController(SubiquityController):
os.path.join(defaultLocDir, "locale")] os.path.join(defaultLocDir, "locale")]
return updateLocCmd return updateLocCmd
async def _activate_locale(self, lang, env) -> bool: async def _activate_locale(self, lang, env, skipLocGen=False) -> bool:
""" Return true if succeed in running the last commands """ Return true if succeed in running the last commands
to set the locale. to set the locale.
""" """
@ -111,7 +111,7 @@ class ConfigureController(SubiquityController):
return False return False
updateCmd = self.__update_locale_cmd(lang) updateCmd = self.__update_locale_cmd(lang)
cmds = [[locGenCmd], updateCmd] cmds = [updateCmd] if skipLocGen else [[locGenCmd], updateCmd]
for cmd in cmds: for cmd in cmds:
cp = await arun_command(cmd, env=env) cp = await arun_command(cmd, env=env)
if cp.returncode != 0: if cp.returncode != 0:
@ -283,7 +283,9 @@ class ConfigureController(SubiquityController):
log.error("Failed to install recommended language packs.") log.error("Failed to install recommended language packs.")
return return
ok = await self._activate_locale(lang, env) # We want to run locale-gen if apt fails to install language packs,
# so the other locale definitions match the user expectation.
ok = await self._activate_locale(lang, env, skipLocGen=ok)
if not ok: if not ok:
log.error("Failed to run locale activation commands.") log.error("Failed to run locale activation commands.")
return return