Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/profiles/desktop.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-09-06 12:22:57 +0000
committerAnton Hvornum <anton.feeds@gmail.com>2021-09-06 12:22:57 +0000
commit025dc83194d2bfc0bde73681abf5d280c745806d (patch)
treefd9f46eb5447ade86102806493c1f12f8e6f9e8c /profiles/desktop.py
parent51eb05691a5845652a9dc583de05519f095961f3 (diff)
parentcc6491f0a5d9b7795375a5a86e03fc9eb1c762c7 (diff)
Corrected some minor modifications mentioned in #595 as well as merged in latest changes from master. For future PR's do create a patch-branch for upstream patches to avoid changes to your local repo.
Diffstat (limited to 'profiles/desktop.py')
-rw-r--r--profiles/desktop.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/profiles/desktop.py b/profiles/desktop.py
index eaf145c2..b9174ac5 100644
--- a/profiles/desktop.py
+++ b/profiles/desktop.py
@@ -50,12 +50,11 @@ def _prep_function(*args, **kwargs):
# Temporarily store the selected desktop profile
# in a session-safe location, since this module will get reloaded
# the next time it gets executed.
- if '_desktop_profile' not in archinstall.storage.keys():
+ if not archinstall.storage.get('_desktop_profile', None):
archinstall.storage['_desktop_profile'] = desktop
-
+ if not archinstall.arguments.get('desktop-environment', None):
+ archinstall.arguments['desktop-environment'] = desktop
profile = archinstall.Profile(None, desktop)
- # Set the resolved profile path to the actual desktop environment
- archinstall.arguments['profile'] = profile
# Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered.
with profile.load_instructions(namespace=f"{desktop}.py") as imported:
if hasattr(imported, '_prep_function'):