RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Define an standard locale for all the commands executed (#827) 

* Define an standard locale for all the commands executed inside the application

* Allow LC_ALL to be overriden during call

* flake8 corrections
This commit is contained in:
Werner Llácer 2022-01-06 23:26:49 +01:00 committed by GitHub
parent e32cf71ae7
commit a8862e9b24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archinstall/lib/general.py
View File

@ -188,7 +188,8 @@ class SysCommandWorker:
self.cmd = cmd self.cmd = cmd
self.callbacks = callbacks self.callbacks = callbacks
self.peak_output = peak_output self.peak_output = peak_output
self.environment_vars = environment_vars # define the standard locale for command outputs. For now the C ascii one. Can be overriden
self.environment_vars = {'LC_ALL':'C' , **environment_vars}
self.logfile = logfile self.logfile = logfile
self.working_directory = working_directory self.working_directory = working_directory
@ -368,7 +369,7 @@ class SysCommand:
peak_output :Optional[bool] = False, peak_output :Optional[bool] = False,
environment_vars :Optional[Dict[str, Any]] = None, environment_vars :Optional[Dict[str, Any]] = None,
working_directory :Optional[str] = './'): working_directory :Optional[str] = './'):
_callbacks = {} _callbacks = {}
if callbacks: if callbacks:
for hook, func in callbacks.items(): for hook, func in callbacks.items():

4
archinstall/lib/luks.py
View File

@ -179,8 +179,8 @@ class luks2:
raise OSError(2, f"Could not import {path} as a disk encryption key, file is missing.", str(path)) raise OSError(2, f"Could not import {path} as a disk encryption key, file is missing.", str(path))
log(f'Adding additional key-file {path} for {self.partition}', level=logging.INFO) log(f'Adding additional key-file {path} for {self.partition}', level=logging.INFO)
worker = SysCommandWorker(f"/usr/bin/cryptsetup -q -v luksAddKey {self.partition.path} {path}",
worker = SysCommandWorker(f"/usr/bin/cryptsetup -q -v luksAddKey {self.partition.path} {path}") environment_vars={'LC_ALL':'C'})
pw_injected = False pw_injected = False
while worker.is_alive(): while worker.is_alive():
if b'Enter any existing passphrase' in worker and pw_injected is False: if b'Enter any existing passphrase' in worker and pw_injected is False: