napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[displaymanager] Call basic_setup through instance

Browse Source 
- Now that basic_setup is factored out into the classes,
   call it via an instance before doing set_autologin.
This commit is contained in:
Adriaan de Groot 2018-08-20 09:56:15 -04:00
parent cd0cdfc9af
commit 1c0b9e6a2a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/displaymanager/main.py
View File

@ -778,7 +778,12 @@ def run():
for dm in displaymanagers: for dm in displaymanagers:
impl = [ cls for name, cls in display_managers if name == dm ] impl = [ cls for name, cls in display_managers if name == dm ]
if len(impl) == 1: if len(impl) == 1:
dm_message = impl[0]().set_autologin(username, default_desktop_environment, root_mount_point) dm_impl = impl[0]() # Instantiate the class that was named
dm_message = None
if enable_basic_setup:
dm_message = dm_impl.basic_setup()
if dm_message is None:
dm_message = dm_impl.set_autologin(username, default_desktop_environment, root_mount_point)
else: else:
dm_message = ("Can not configure {!s}".format(dm), "{!s} has {!d} implementation classes.".format(dm).format(len(impl))) dm_message = ("Can not configure {!s}".format(dm), "{!s} has {!d} implementation classes.".format(dm).format(len(impl)))