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

[displaymanager] Believe the .desktop file

Browse Source 
- if a default DE is configured but the executable doesn't exist,
   believe the .desktop file. Then use that, and warn if the
   whole thing can not be found.
This commit is contained in:
Adriaan de Groot 2019-09-30 14:53:05 +02:00
parent 290a0698d8
commit 1beadee2a7
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

@ -123,7 +123,7 @@ class DesktopEnvironment:
return (self.find_executable(root_mount_point) is not None or return (self.find_executable(root_mount_point) is not None or
self._search_tryexec(root_mount_point, desktop_file) is not None) self._search_tryexec(root_mount_point, desktop_file) is not None)
def find(self, root_mount_point): def update_from_desktop_file(self, root_mount_point):
""" """
Find thie DE in the target system at @p root_mount_point. Find thie DE in the target system at @p root_mount_point.
This can update the *executable* configuration value if This can update the *executable* configuration value if
@ -924,6 +924,11 @@ def run():
default_desktop_environment = DesktopEnvironment( default_desktop_environment = DesktopEnvironment(
entry["executable"], entry["desktopFile"] entry["executable"], entry["desktopFile"]
) )
# Adjust if executable is bad, but desktopFile isn't.
if not default_desktop_environment.update_from_desktop_file(root_mount_point):
libcalamares.utils.warning(
"The configured default desktop environment, {!s}, "
"can not be found.".format(default_desktop_environment.desktop_file))
else: else:
default_desktop_environment = find_desktop_environment( default_desktop_environment = find_desktop_environment(
root_mount_point root_mount_point