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

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.

This commit is contained in:
Anton Hvornum 2020-09-30 09:36:45 +00:00
parent 34e8e63f71
commit 1bff423195
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/user_interaction.py
View File

@ -52,8 +52,12 @@ def select_profile(options):
# Some crude safety checks, make sure the imported profile has # Some crude safety checks, make sure the imported profile has
# a __name__ check and if so, check if it's got a _prep_function() # a __name__ check and if so, check if it's got a _prep_function()
# we can call to ask for more user input. # we can call to ask for more user input.
#
# If the requirements are met, import with .py in the namespace to not
# trigger a traditional:
# if __name__ == 'moduleName'
if '__name__' in source_data and '_prep_function' in source_data: if '__name__' in source_data and '_prep_function' in source_data:
with profile.load_instructions() as imported: with profile.load_instructions(namespace=f"{selected_profile}.py") as imported:
if hasattr(imported, '_prep_function'): if hasattr(imported, '_prep_function'):
return profile, imported return profile, imported