From e78418b6936e6e603f6e3760b72e9308a69ddb8c Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kevin.kofler@chello.at>
Date: Sat, 29 Nov 2014 17:14:17 +0100
Subject: [PATCH] displaymanager: Don't error if a DM is not installed.

If a display manager is in the list, but not installed, do not return an
error message, but only print a debugging message and proceed.

This allows distributions that support multiple display managers to list
them all, independently of what the concrete live image will be using.
---
 src/modules/displaymanager/main.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py
index 546ec742f..4a1e4858f 100644
--- a/src/modules/displaymanager/main.py
+++ b/src/modules/displaymanager/main.py
@@ -188,7 +188,7 @@ def run():
     # We acquire a list of displaymanagers, either from config or (overridden) from globalstorage.
     # This module will try to set up (including autologin) all the displaymanagers in the list, in that specific order.
     # Most distros will probably only ship one displaymanager.
-    # If a displaymanager is in the list but not installed, this module quits with error.
+    # If a displaymanager is in the list but not installed, a debugging message is printed and the entry ignored.
 
     if "displaymanagers" in libcalamares.job.configuration:
         displaymanagers = libcalamares.job.configuration["displaymanagers"]
@@ -212,12 +212,14 @@ def run():
     # Setup slim
     if "slim" in displaymanagers:
         if not os.path.exists("%s/usr/bin/slim" % root_mount_point):
-            return "slim selected but not installed", ""
+            libcalamares.utils.debug("slim selected but not installed")
+            displaymanagers.remove("slim")
 
     # Setup sddm
     if "sddm" in displaymanagers:
         if not os.path.exists("%s/usr/bin/sddm" % root_mount_point):
-            return "sddm selected but not installed", ""
+            libcalamares.utils.debug("sddm selected but not installed")
+            displaymanagers.remove("sddm")
 
     # setup lightdm
     if "lightdm" in displaymanagers:
@@ -242,7 +244,8 @@ def run():
             libcalamares.utils.chroot_call(
                 ['chmod', '+r' '/etc/lightdm/lightdm.conf'])
         else:
-            return "lightdm selected but not installed", ""
+            libcalamares.utils.debug("lightdm selected but not installed")
+            displaymanagers.remove("lightdm")
 
     # Setup gdm
     if "gdm" in displaymanagers:
@@ -265,7 +268,8 @@ def run():
             os.system(
                 "echo \"Icon=\" >> %s/var/lib/AccountsService/users/gdm" % root_mount_point)
         else:
-            return "gdm selected but not installed", ""
+            libcalamares.utils.debug("gdm selected but not installed")
+            displaymanagers.remove("gdm")
 
     # Setup mdm
     if "mdm" in displaymanagers:
@@ -284,7 +288,8 @@ def run():
                 os.system(
                     "sed -i 's|default.desktop|%s.desktop|g' %s/etc/mdm/custom.conf" % (default_desktop_environment.desktop_file, root_mount_point))
         else:
-            return "mdm selected but not installed", ""
+            libcalamares.utils.debug("mdm selected but not installed")
+            displaymanagers.remove("mdm")
 
     # Setup lxdm
     if "lxdm" in displaymanagers:
@@ -300,7 +305,8 @@ def run():
             libcalamares.utils.chroot_call(
                 ['chmod', '+r', '/etc/lxdm/lxdm.conf'])
         else:
-            return "lxdm selected but not installed", ""
+            libcalamares.utils.debug("lxdm selected but not installed")
+            displaymanagers.remove("lxdm")
 
     # Setup kdm
     if "kdm" in displaymanagers:
@@ -316,7 +322,8 @@ def run():
                 ['xdg-icon-resource', 'forceupdate', '--theme', 'hicolor'])
             libcalamares.utils.chroot_call(['update-desktop-database', '-q'])
         else:
-            return "kdm selected but not installed", ""
+            libcalamares.utils.debug("kdm selected but not installed")
+            displaymanagers.remove("kdm")
 
     if username != None:
         libcalamares.utils.debug(