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

Remove unused SysCommand and SysCommandWorker fields (#3374)

This commit is contained in:
correctmost 2025-04-09 08:47:30 +00:00 committed by GitHub
parent 0028a572e8
commit d35ac2a235
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
archinstall/lib/general.py
View File

@ -10,7 +10,7 @@ import string
import subprocess import subprocess
import sys import sys
import time import time
from collections.abc import Callable, Iterator from collections.abc import Iterator
from datetime import date, datetime from datetime import date, datetime
from enum import Enum from enum import Enum
from pathlib import Path from pathlib import Path
@ -103,10 +103,8 @@ class SysCommandWorker:
def __init__( def __init__(
self, self,
cmd: str | list[str], cmd: str | list[str],
callbacks: dict[str, Any] | None = None,
peek_output: bool | None = False, peek_output: bool | None = False,
environment_vars: dict[str, str] | None = None, environment_vars: dict[str, str] | None = None,
logfile: None = None,
working_directory: str | None = './', working_directory: str | None = './',
remove_vt100_escape_codes_from_lines: bool = True remove_vt100_escape_codes_from_lines: bool = True
): ):
@ -117,14 +115,12 @@ class SysCommandWorker:
cmd[0] = locate_binary(cmd[0]) cmd[0] = locate_binary(cmd[0])
self.cmd = cmd self.cmd = cmd
self.callbacks = callbacks or {}
self.peek_output = peek_output self.peek_output = peek_output
# define the standard locale for command outputs. For now the C ascii one. Can be overridden # define the standard locale for command outputs. For now the C ascii one. Can be overridden
self.environment_vars = {'LC_ALL': 'C'} self.environment_vars = {'LC_ALL': 'C'}
if environment_vars: if environment_vars:
self.environment_vars.update(environment_vars) self.environment_vars.update(environment_vars)
self.logfile = logfile
self.working_directory = working_directory self.working_directory = working_directory
self.exit_code: int | None = None self.exit_code: int | None = None
@ -326,17 +322,11 @@ class SysCommand:
def __init__( def __init__(
self, self,
cmd: str | list[str], cmd: str | list[str],
callbacks: dict[str, Callable[[Any], Any]] = {},
start_callback: Callable[[Any], Any] | None = None,
peek_output: bool | None = False, peek_output: bool | None = False,
environment_vars: dict[str, str] | None = None, environment_vars: dict[str, str] | None = None,
working_directory: str | None = './', working_directory: str | None = './',
remove_vt100_escape_codes_from_lines: bool = True): remove_vt100_escape_codes_from_lines: bool = True):
self._callbacks = callbacks.copy()
if start_callback:
self._callbacks['on_start'] = start_callback
self.cmd = cmd self.cmd = cmd
self.peek_output = peek_output self.peek_output = peek_output
self.environment_vars = environment_vars self.environment_vars = environment_vars
@ -386,7 +376,6 @@ class SysCommand:
with SysCommandWorker( with SysCommandWorker(
self.cmd, self.cmd,
callbacks=self._callbacks,
peek_output=self.peek_output, peek_output=self.peek_output,
environment_vars=self.environment_vars, environment_vars=self.environment_vars,
remove_vt100_escape_codes_from_lines=self.remove_vt100_escape_codes_from_lines, remove_vt100_escape_codes_from_lines=self.remove_vt100_escape_codes_from_lines,