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

Only parse profile classes when loading modules (#2088) 

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
This commit is contained in:
Daniel Girtler 2023-09-22 19:43:12 +10:00 committed by GitHub
parent 6d908e8cd7
commit 8e40de85fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archinstall/lib/profile/profiles_handler.py
View File

@ -2,6 +2,7 @@ from __future__ import annotations
import importlib.util import importlib.util
import sys import sys
import inspect
from collections import Counter from collections import Counter
from functools import cached_property from functools import cached_property
from pathlib import Path from pathlib import Path
@ -276,12 +277,15 @@ class ProfileHandler:
profiles = [] profiles = []
for k, v in module.__dict__.items(): for k, v in module.__dict__.items():
if isinstance(v, type) and v.__module__ == module.__name__: if isinstance(v, type) and v.__module__ == module.__name__:
try: bases = inspect.getmro(v)
cls_ = v()
if isinstance(cls_, Profile): if Profile in bases:
profiles.append(cls_) try:
except Exception: cls_ = v()
debug(f'Cannot import {module}, it does not appear to be a Profile class') if isinstance(cls_, Profile):
profiles.append(cls_)
except Exception:
debug(f'Cannot import {module}, it does not appear to be a Profile class')
return profiles return profiles