[RigoDaemon] move PolicyKit actions to RigoDaemon

This commit is contained in:
Fabio Erculiani
2012-03-15 17:42:57 +01:00
parent 9fc23256e9
commit ab0e36a313
2 changed files with 9 additions and 10 deletions
+6
View File
@@ -15,3 +15,9 @@ class DbusConfig:
BUS_NAME = "org.sabayon.Rigo"
OBJECT_PATH = "/"
class PolicyActions:
# PolicyKit update action
UPDATE_REPOSITORIES = "org.sabayon.RigoDaemon.update"
UPGRADE_SYSTEM = "org.sabayon.RigoDaemon.upgrade"
MANAGE_APP = "org.sabayon.RigoDaemon.manage"
+3 -10
View File
@@ -60,7 +60,8 @@ from rigo.utils import build_application_store_url, build_register_url, \
escape_markup, prepare_markup
from RigoDaemon.enums import ActivityStates as DaemonActivityStates
from RigoDaemon.config import DbusConfig as DaemonDbusConfig
from RigoDaemon.config import DbusConfig as DaemonDbusConfig, \
PolicyActions
from entropy.const import etpConst, etpUi, const_debug_write, \
const_debug_enabled, const_convert_to_unicode, const_isunicode
@@ -81,13 +82,6 @@ class RigoAuthenticationController(object):
and Application management.
"""
class RigoDaemonPolicyActions:
# PolicyKit update action
UPDATE_REPOSITORIES = "org.sabayon.RigoDaemon.update"
UPGRADE_SYSTEM = "org.sabayon.RigoDaemon.upgrade"
MANAGE_APP = "org.sabayon.RigoDaemon.manage"
def __init__(self):
self._mainloop = GLib.MainLoop()
@@ -563,9 +557,8 @@ class RigoServiceController(GObject.Object):
auth_res['sem'].release()
action_id = None
pol = RigoAuthenticationController.RigoDaemonPolicyActions
if daemon_activity == DaemonActivityStates.UPDATING_REPOSITORIES:
action_id = pol.UPDATE_REPOSITORIES
action_id = PolicyActions.UPDATE_REPOSITORIES
if action_id is None:
raise AttributeError("unsupported daemon activity")