Purge unused patches from repository
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
This commit is contained in:
parent
ce7f9fd4ea
commit
4e9a630485
@ -1,36 +0,0 @@
|
||||
From c7fa612023a163e8b2352e1170c6df3fceb19b27 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Thu, 19 Jul 2018 13:14:09 -0400
|
||||
Subject: [PATCH 1/3] lib: don't set loaded state until seat is fetched
|
||||
|
||||
At the moment we set is-loaded on the user-manager
|
||||
object as soon as we start fetching the seat, but
|
||||
we should waiting until the seat is fetched, so
|
||||
that can_switch() will return the correct value
|
||||
if the caller waited until the loaded signal
|
||||
to use it.
|
||||
|
||||
This commit changes the >= to > which I believe
|
||||
was the original intention anyway.
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=107298
|
||||
---
|
||||
src/libaccountsservice/act-user-manager.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c
|
||||
index 325421b..e7e26b1 100644
|
||||
--- a/src/libaccountsservice/act-user-manager.c
|
||||
+++ b/src/libaccountsservice/act-user-manager.c
|
||||
@@ -2382,7 +2382,7 @@ maybe_set_is_loaded (ActUserManager *manager)
|
||||
/* Don't set is_loaded yet unless the seat is already loaded enough
|
||||
* or failed to load.
|
||||
*/
|
||||
- if (manager->priv->seat.state >= ACT_USER_MANAGER_SEAT_STATE_GET_ID) {
|
||||
+ if (manager->priv->seat.state > ACT_USER_MANAGER_SEAT_STATE_GET_ID) {
|
||||
g_debug ("ActUserManager: Seat loaded, so now setting loaded property");
|
||||
} else if (manager->priv->seat.state == ACT_USER_MANAGER_SEAT_STATE_UNLOADED) {
|
||||
g_debug ("ActUserManager: Seat wouldn't load, so giving up on it and setting loaded property");
|
||||
--
|
||||
2.19.0
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From 74fed8d975fd2e2cba644eeb8021393fc81b7151 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Fri, 10 Aug 2018 15:15:51 -0400
|
||||
Subject: [PATCH 3/3] lib: don't fail loading if logind isn't working right
|
||||
|
||||
At the moment if logind can fail in two ways when
|
||||
asking the session associated with the current pid:
|
||||
|
||||
1) ENOENT, the process isn't part of a registered session
|
||||
2) ENODATA, the mechanism for checking which session a
|
||||
process is registered with isn't working.
|
||||
|
||||
If we hit the second case then wefail loading the user manager
|
||||
entirely. This leads to the dbus proxy associated with a user
|
||||
from loading and the user getting stuck with defaults like a
|
||||
NULL xsession and systemaccount=TRUE
|
||||
|
||||
This commit changes the behavior for the second case to be
|
||||
like the first. Namely, to accept there's no associated
|
||||
session and carry on as best we can.
|
||||
---
|
||||
src/libaccountsservice/act-user-manager.c | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c
|
||||
index e7e26b1..6dc1d15 100644
|
||||
--- a/src/libaccountsservice/act-user-manager.c
|
||||
+++ b/src/libaccountsservice/act-user-manager.c
|
||||
@@ -1139,12 +1139,9 @@ _get_current_systemd_session_id (ActUserManager *manager)
|
||||
res = sd_pid_get_session (0, &session_id);
|
||||
|
||||
if (res == -ENOENT) {
|
||||
- session_id = NULL;
|
||||
- } else if (res < 0) {
|
||||
g_debug ("Failed to identify the current session: %s",
|
||||
strerror (-res));
|
||||
- unload_seat (manager);
|
||||
- return;
|
||||
+ session_id = NULL;
|
||||
}
|
||||
|
||||
manager->priv->seat.session_id = g_strdup (session_id);
|
||||
--
|
||||
2.19.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user