Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-02-17 14:21:46 +0100
committerAnton Hvornum <anton.feeds@gmail.com>2021-02-17 14:21:46 +0100
commitad4733bbd0b0e889ad902a7d954ec985fc7a24fe (patch)
treea0f4feaa14fd9fc87d4b3572f9efbd796291ba37 /archinstall
parent758b12e6746ac76c57e7725d4e35abbb4805ad23 (diff)
Simplified profile prep-execution slightly in guided.py. The code can be improved further but it's now more easily read what's going on.
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/profiles.py17
-rw-r--r--archinstall/lib/user_interaction.py18
2 files changed, 18 insertions, 17 deletions
diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py
index f9aa206c..7b0e78e4 100644
--- a/archinstall/lib/profiles.py
+++ b/archinstall/lib/profiles.py
@@ -157,6 +157,23 @@ class Profile(Script):
def install(self):
return self.execute()
+ def has_prep_function(self):
+ with open(self.path, 'r') as source:
+ source_data = source.read()
+
+ # Some crude safety checks, make sure the imported profile has
+ # a __name__ check and if so, check if it's got a _prep_function()
+ # 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:
+ with profile.load_instructions(namespace=f"{selected_profile}.py") as imported:
+ if hasattr(imported, '_prep_function'):
+ return True
+ return False
+
class Application(Profile):
def __repr__(self, *args, **kwargs):
return f'Application({os.path.basename(self.profile)})'
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index bdf8acaf..5941903d 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -174,23 +174,7 @@ def select_profile(options):
else:
RequirementError("Selected profile does not exist.")
- profile = Profile(None, selected_profile)
- with open(profile.path, 'r') as source:
- source_data = source.read()
-
- # Some crude safety checks, make sure the imported profile has
- # a __name__ check and if so, check if it's got a _prep_function()
- # 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:
- with profile.load_instructions(namespace=f"{selected_profile}.py") as imported:
- if hasattr(imported, '_prep_function'):
- return imported
-
- return profile
+ return Profile(None, selected_profile)
raise RequirementError("Selecting profiles require a least one profile to be given as an option.")