public/gpupdate
1
0
Fork 1
mirror of https://github.com/altlinux/gpupdate.git synced 2025-03-26 10:50:44 +03:00
Code Releases Wiki Activity

In util/dbus.py fixes:

Browse Source 
----------------------
  - Few Lines: expected 2 blank lines
  - Few Lines: line too long (102 > 99 characters) (col 100)
This commit is contained in:
Viktor Volkov 2020-01-17 18:13:35 +04:00
parent 07169b412d
commit 86986e2f4d
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gpoa/util/dbus.py
View File

@ -20,6 +20,7 @@ import dbus
from .logging import slogm
class dbus_runner:
'''
Runs GPOA via D-Bus supplying username (if specified). This is needed
@ -46,6 +47,7 @@ class dbus_runner:
print_dbus_result(result)
#self.interface.Quit()
def start_gpupdate_user():
'''
Make gpupdate-user.service "runtime-enabled" and start it. This
@ -54,12 +56,18 @@ def start_gpupdate_user():
'''
unit_name = 'gpupdate-user.service'
session_bus = dbus.SessionBus()
systemd_user_bus = session_bus.get_object('org.freedesktop.systemd1', '/org/freedesktop/systemd1')
systemd_user_interface = dbus.Interface(systemd_user_bus, dbus_interface='org.freedesktop.systemd1.Manager')
systemd_user_bus = session_bus.get_object(
'org.freedesktop.systemd1', '/org/freedesktop/systemd1')
systemd_user_interface = dbus.Interface(
systemd_user_bus, dbus_interface='org.freedesktop.systemd1.Manager')
gpupdate_user_unit = systemd_user_interface.GetUnit(dbus.String(unit_name))
job = systemd_user_interface.StartUnit(unit_name, 'replace')
#job = manager.StartTransientUnit('noname', 'replace', properties, [])
def is_oddjobd_gpupdate_accessible():
'''
Check if oddjobd is running via systemd so it will be possible
@ -69,12 +77,17 @@ def is_oddjobd_gpupdate_accessible():
try:
system_bus = dbus.SystemBus()
systemd_bus = system_bus.get_object('org.freedesktop.systemd1', '/org/freedesktop/systemd1')
systemd_bus = system_bus.get_object(
'org.freedesktop.systemd1', '/org/freedesktop/systemd1')
systemd_interface = dbus.Interface(systemd_bus, 'org.freedesktop.systemd1.Manager')
oddjobd_unit = systemd_interface.GetUnit(dbus.String('oddjobd.service'))
oddjobd_proxy = system_bus.get_object('org.freedesktop.systemd1', str(oddjobd_unit))
oddjobd_properties = dbus.Interface(oddjobd_proxy, dbus_interface='org.freedesktop.DBus.Properties')
oddjobd_properties = dbus.Interface(oddjobd_proxy,
dbus_interface='org.freedesktop.DBus.Properties')
# Check if oddjobd service is running
oddjobd_state = oddjobd_properties.Get('org.freedesktop.systemd1.Unit', 'ActiveState')
@ -91,6 +104,7 @@ def is_oddjobd_gpupdate_accessible():
return oddjobd_accessible
def print_dbus_result(result):
'''
Print lines returned by oddjobd (called via D-Bus) to stdout.