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