From ab0e36a313138e8cbee997ee57c9cb70f0969abe Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 15 Mar 2012 17:42:57 +0100 Subject: [PATCH] [RigoDaemon] move PolicyKit actions to RigoDaemon --- rigo/RigoDaemon/config.py | 6 ++++++ rigo/rigo_app.py | 13 +++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/rigo/RigoDaemon/config.py b/rigo/RigoDaemon/config.py index a87257877..39b0585ff 100644 --- a/rigo/RigoDaemon/config.py +++ b/rigo/RigoDaemon/config.py @@ -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" diff --git a/rigo/rigo_app.py b/rigo/rigo_app.py index 799b7e4f4..89be79451 100644 --- a/rigo/rigo_app.py +++ b/rigo/rigo_app.py @@ -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")