|
 |
5b70e6 |
From 86be303a7c5ed5057d0357a85e27cdb6885122fe Mon Sep 17 00:00:00 2001
|
|
|
5b70e6 |
From: Petr Lautrbach <plautrba@redhat.com>
|
|
|
5b70e6 |
Date: Wed, 12 May 2021 19:19:29 +0200
|
|
|
5b70e6 |
Subject: [PATCH] dbus: Use GLib.MainLoop()
|
|
|
5b70e6 |
|
|
|
5b70e6 |
Fixes:
|
|
|
5b70e6 |
PyGIDeprecationWarning: GObject.MainLoop is deprecated; use GLib.MainLoop instead
|
|
|
5b70e6 |
|
|
|
5b70e6 |
Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
|
|
|
5b70e6 |
---
|
|
|
5b70e6 |
dbus/selinux_server.py | 10 ++++++----
|
|
|
5b70e6 |
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
5b70e6 |
|
|
|
5b70e6 |
diff --git a/dbus/selinux_server.py b/dbus/selinux_server.py
|
|
|
5b70e6 |
index b7c9378bcb5d..a969f2268ceb 100644
|
|
|
5b70e6 |
--- a/dbus/selinux_server.py
|
|
|
5b70e6 |
+++ b/dbus/selinux_server.py
|
|
|
5b70e6 |
@@ -2,8 +2,9 @@
|
|
|
5b70e6 |
|
|
|
5b70e6 |
import dbus
|
|
|
5b70e6 |
import dbus.service
|
|
|
5b70e6 |
-import dbus.mainloop.glib
|
|
|
5b70e6 |
+from dbus.mainloop.glib import DBusGMainLoop
|
|
|
5b70e6 |
from gi.repository import GObject
|
|
|
5b70e6 |
+from gi.repository import GLib
|
|
|
5b70e6 |
import os
|
|
|
5b70e6 |
import selinux
|
|
|
5b70e6 |
from subprocess import Popen, PIPE, STDOUT
|
|
|
5b70e6 |
@@ -145,9 +146,10 @@ class selinux_server(dbus.service.Object):
|
|
|
5b70e6 |
raise ValueError("%s does not exist" % path)
|
|
|
5b70e6 |
|
|
|
5b70e6 |
if __name__ == "__main__":
|
|
|
5b70e6 |
- mainloop = GObject.MainLoop()
|
|
|
5b70e6 |
- dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
|
|
|
5b70e6 |
+ DBusGMainLoop(set_as_default=True)
|
|
|
5b70e6 |
+ mainloop = GLib.MainLoop()
|
|
|
5b70e6 |
+
|
|
|
5b70e6 |
system_bus = dbus.SystemBus()
|
|
|
5b70e6 |
name = dbus.service.BusName("org.selinux", system_bus)
|
|
|
5b70e6 |
- object = selinux_server(system_bus, "/org/selinux/object")
|
|
|
5b70e6 |
+ server = selinux_server(system_bus, "/org/selinux/object")
|
|
|
5b70e6 |
mainloop.run()
|
|
|
5b70e6 |
--
|
|
|
5b70e6 |
2.32.0
|
|
|
5b70e6 |
|