From 63d774b7d7f82cd0a4ab59c44128d271baaa6dd4 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 30 Sep 2020 09:38:46 +0000 Subject: Fixing a import logic issue. We don't want to trigger if __name__ ... during _prep_function() calls. So we'll import the module with a specific namespace containing the .py which shouldn't be able to happen when normal programmers do normal imports as .py gets removed normally. --- archinstall/lib/profiles.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py index 60d41ea1..6d7a8b42 100644 --- a/archinstall/lib/profiles.py +++ b/archinstall/lib/profiles.py @@ -85,10 +85,11 @@ class Profile(): # def py_exec_mock(self): # spec.loader.exec_module(imported) - def load_instructions(self): + def load_instructions(self, namespace=None): if (absolute_path := self.path): if os.path.splitext(absolute_path)[1] == '.py': - namespace = os.path.splitext(os.path.basename(absolute_path))[0] + if not namespace: + namespace = os.path.splitext(os.path.basename(absolute_path))[0] spec = importlib.util.spec_from_file_location(namespace, absolute_path) imported = importlib.util.module_from_spec(spec) sys.modules[namespace] = imported -- cgit v1.2.3-70-g09d2