projectatomic/atomic
1
0
Fork 0
mirror of https://github.com/projectatomic/atomic.git synced 2026-02-06 03:45:28 +01:00
Code Issues Releases Activity

atomic_dbus: keep the name until the process exits

Browse Source 
The call dbus.service.BusName() claims the name while the returned
object is alive. It wasn't stored into a variable, so the name was
released immediately, but the service keeps running (potentially
indefinitely) with no use.

Fix this by calling request_name() directly, so that we can give useful
feedback (and end the process) when the name is already owned by another
process.

Fixes #763

Closes: #770
Approved by: cgwalters
This commit is contained in:
Lars Karlitski
2016-11-24 16:25:31 +01:00
committed by Atomic Bot
parent 580bc2e460
commit e937650ccd
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
atomic_dbus.py
View File

@@ -29,6 +29,8 @@ from Atomic.trust import Trust
from Atomic.uninstall import Uninstall
from Atomic.verify import Verify
DBUS_NAME_FLAG_DO_NOT_QUEUE = 4
DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER = 1
class atomic_dbus(slip.dbus.service.Object):
default_polkit_auth_required = "org.atomic.readwrite"
@@ -570,7 +572,10 @@ if __name__ == "__main__":
mainloop = GObject.MainLoop()
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
system_bus = dbus.SystemBus()
busname = dbus.service.BusName("org.atomic", system_bus)
atomic_object = atomic_dbus(system_bus, "/org/atomic/object")
slip.dbus.service.set_mainloop(mainloop)
mainloop.run()
if (system_bus.request_name("org.atomic", DBUS_NAME_FLAG_DO_NOT_QUEUE) == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER):
atomic_object = atomic_dbus(system_bus, "/org/atomic/object")
slip.dbus.service.set_mainloop(mainloop)
mainloop.run()
else:
print("Another process owns the 'org.atomic' D-Bus name. Exiting.")