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

Added exception handling to check_output 

I tweaked the optimized return of check_output. Worth mentioning that `check_output()` will raise an exception `subprocess.CalledProcessError: Command 'lscpu | grep AMD' returned non-zero exit status 1.`.
This commit is contained in:
Anton Hvornum 2021-09-06 13:40:45 +00:00 committed by GitHub
parent 5fe752cf72
commit 8d7ccde162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall/lib/hardware.py
View File

@ -63,13 +63,19 @@ def has_wifi() -> bool:
def has_amd_cpu() -> bool: def has_amd_cpu() -> bool:
if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode(): try:
return True return subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode()
except:
pass
return False return False
def has_intel_cpu() -> bool: def has_intel_cpu() -> bool:
try:
return subprocess.check_output("lscpu | grep Intel", shell=True).strip().decode() return subprocess.check_output("lscpu | grep Intel", shell=True).strip().decode()
except:
pass
return False
def has_uefi() -> bool: def has_uefi() -> bool:
return os.path.isdir('/sys/firmware/efi') return os.path.isdir('/sys/firmware/efi')