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

Added spec as an instance variable to Script()

This commit is contained in:
Anton Hvornum 2020-12-06 11:33:28 +01:00
parent d3462aa483
commit 0e8aee0b54
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archinstall/lib/profiles.py
View File

@ -73,6 +73,7 @@ class Script():
self.profile = profile self.profile = profile
self.installer = installer self.installer = installer
self.converted_path = None self.converted_path = None
self.spec = None
self.namespace = os.path.splitext(os.path.basename(self.path))[0] self.namespace = os.path.splitext(os.path.basename(self.path))[0]
def localize_path(self, profile_path): def localize_path(self, profile_path):
@ -116,18 +117,18 @@ class Script():
if namespace: if namespace:
self.namespace = namespace self.namespace = namespace
spec = importlib.util.spec_from_file_location(self.namespace, self.path) self.spec = importlib.util.spec_from_file_location(self.namespace, self.path)
imported = importlib.util.module_from_spec(spec) imported = importlib.util.module_from_spec(self.spec)
sys.modules[self.namespace] = imported sys.modules[self.namespace] = imported
return imported return imported
def execute(self): def execute(self):
if not self.namespace in sys.modules: if not self.namespace in sys.modules or self.spec is None:
self.load_instructions() self.load_instructions()
__builtins__['installation'] = self.installer # TODO: Replace this with a import archinstall.session instead __builtins__['installation'] = self.installer # TODO: Replace this with a import archinstall.session instead
spec.loader.exec_module(sys.modules[self.namespace]) self.spec.loader.exec_module(sys.modules[self.namespace])
return True return True