parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

chroot: extract run_cmd() to new exec.py, use in utils.py and chroot/abstract.py

Browse source
This commit is contained in:
InsanePrawn 2022-08-15 02:13:55 +02:00
parent e3ad2edc69
commit 66ac56d715
3 changed files with 123 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
utils.py
View file

@ -4,6 +4,8 @@ import subprocess
from shutil import which
from typing import Optional, Union, Sequence
from exec import run_cmd, run_root_cmd
def programs_available(programs: Union[str, Sequence[str]]) -> bool:
if type(programs) is str:
@ -15,7 +17,7 @@ def programs_available(programs: Union[str, Sequence[str]]) -> bool:
def umount(dest: str, lazy=False):
return subprocess.run(
return run_root_cmd(
[
'umount',
'-c' + ('l' if lazy else ''),
@ -33,7 +35,7 @@ def mount(src: str, dest: str, options: list[str] = ['bind'], fs_type: Optional[
if fs_type:
opts += ['-t', fs_type]
result = subprocess.run(
result = run_root_cmd(
['mount'] + opts + [
src,
dest,
@ -46,7 +48,7 @@ def mount(src: str, dest: str, options: list[str] = ['bind'], fs_type: Optional[
def check_findmnt(path: str):
result = subprocess.run(
result = run_root_cmd(
[
'findmnt',
'-n',
@ -59,8 +61,10 @@ def check_findmnt(path: str):
return result.stdout.decode().strip()
def git(cmd: list[str], dir='.', capture_output=False) -> subprocess.CompletedProcess:
return subprocess.run(['git'] + cmd, cwd=dir, capture_output=capture_output)
def git(cmd: list[str], dir='.', capture_output=False, user: Optional[str] = None) -> subprocess.CompletedProcess:
result = run_cmd(['git'] + cmd, cwd=dir, capture_output=capture_output, switch_user=user)
assert isinstance(result, subprocess.CompletedProcess)
return result
def log_or_exception(raise_exception: bool, msg: str, exc_class=Exception, log_level=logging.WARNING):