From 0e8aee0b5411565e85857ad338249f7f0e774af9 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 6 Dec 2020 11:33:28 +0100 Subject: Added spec as an instance variable to Script() --- archinstall/lib/profiles.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'archinstall') diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py index 0d1c78ee..3e40e1f8 100644 --- a/archinstall/lib/profiles.py +++ b/archinstall/lib/profiles.py @@ -73,6 +73,7 @@ class Script(): self.profile = profile self.installer = installer self.converted_path = None + self.spec = None self.namespace = os.path.splitext(os.path.basename(self.path))[0] def localize_path(self, profile_path): @@ -116,18 +117,18 @@ class Script(): if namespace: self.namespace = namespace - spec = importlib.util.spec_from_file_location(self.namespace, self.path) - imported = importlib.util.module_from_spec(spec) + self.spec = importlib.util.spec_from_file_location(self.namespace, self.path) + imported = importlib.util.module_from_spec(self.spec) sys.modules[self.namespace] = imported return imported 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() __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 -- cgit v1.2.3-70-g09d2