brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windowManager: Ignore error without systemd

Browse Source 
On systems/setups not using systemd, a failure to start gsd-xsettings
with NOT_SUPPORTED does not denote a failure to start Xwayland, just
that we're not using systemd.

In that case, we should just ignore the error, otherwise it will prevent
Xwayland to start on such systems/setups without systemd.

Thanks to Rose Kunkel (@rosekunkel) for spotting the issue/suggesting
the fix.

Fixes: 019229c40e - windowManager: Return failure to start X11 services
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4284
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1850>
This commit is contained in:
Olivier Fourdan 2021-05-18 14:04:05 +02:00 committed by Marge Bot
parent 08fb067d24
commit d9239e2cee
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/ui/windowManager.js
View File

@ -982,9 +982,10 @@ var WindowManager = class {
// managed and gnome-session will have taken care of everything // managed and gnome-session will have taken care of everything
// already. // already.
// Note that we do log cancellation from here. // Note that we do log cancellation from here.
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED)) if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED)) {
log('Error starting X11 services: %s'.format(e.message)); log('Error starting X11 services: %s'.format(e.message));
status = false; status = false;
}
} finally { } finally {
task.return_boolean(status); task.return_boolean(status);
} }