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

frontend: Bunch of fixes to make it work

Browse Source
This commit is contained in:
Игорь Чудов 2020-06-29 16:21:17 +04:00
parent 36d0a92247
commit 292fd9238c
Signed by untrusted user: nir
GPG Key ID: 0F3883600CAE7AAC
6 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gpoa/frontend/cups_applier.py
View File

@ -66,7 +66,7 @@ def connect_printer(connection, prn):
class cups_applier(applier_frontend):
__module_name = 'CUPSApplier'
__module_experimantal = True
__module_experimental = True
__module_enabled = False
def __init__(self, storage):

2
gpoa/frontend/folder_applier.py
View File

@ -36,7 +36,7 @@ class folder_applier(applier_frontend):
self.storage = storage
self.sid = sid
self.folders = self.storage.get_folders(self.sid)
self.__module_enabled = check_module_enabled(self.storage, self.__module_name, self.__module_enabled)
self.__module_enabled = check_enabled(self.storage, self.__module_name, self.__module_enabled)
def apply(self):
for directory_obj in self.folders:

37
gpoa/frontend/frontend_manager.py
View File

@ -123,30 +123,35 @@ class frontend_manager:
logging.debug(slogm('Applying computer part of settings'))
for applier_name, applier_object in self.machine_appliers.items():
logging.debug('Running machine applier {}'.format(applier_name))
applier_object.apply()
try:
applier_object.apply()
except Exception as exc:
logging.error('Error occured while running applier {}: {}'.format(applier_name, exc))
def user_apply(self):
'''
Run appliers for users.
'''
if is_root():
logging.debug(slogm('Running user appliers from administrator context'))
self.user_appliers['shortcuts'].admin_context_apply()
self.user_appliers['folders'].admin_context_apply()
self.user_appliers['gsettings'].admin_context_apply()
self.user_appliers['cifs'].admin_context_apply()
self.user_appliers['package'].admin_context_apply()
self.user_appliers['polkit'].admin_context_apply()
for applier_name, applier_object in self.user_appliers.items():
try:
logging.debug(slogm('Running user applier from administrator context: {}'.format(applier_name)))
applier_object.admin_context_apply()
except Exception as exc:
logging.error('Error occured while running applier {}: {}'.format(applier_name, exc))
logging.debug(slogm('Running user appliers for user context'))
with_privileges(self.username, self.user_appliers['shortcuts'].user_context_apply)
with_privileges(self.username, self.user_appliers['folders'].user_context_apply)
with_privileges(self.username, self.user_appliers['gsettings'].user_context_apply)
try:
logging.debug(slogm('Running user applier from user context: {}'.format(applier_name)))
with_privileges(self.username, applier_object.user_context_apply)
except Exception as exc:
logging.error('Error occured while running applier {}: {}'.format(applier_name, exc))
else:
logging.debug(slogm('Running user appliers from user context'))
self.user_appliers['shortcuts'].user_context_apply()
self.user_appliers['folders'].user_context_apply()
self.user_appliers['gsettings'].user_context_apply()
for applier_name, applier_object in self.user_appliers.items():
try:
logging.debug(slogm('Running user applier from user context: {}'.format(applier_name)))
applier_object.user_context_apply()
except Exception as exc:
logging.error('Error occured while running applier {}: {}'.format(applier_name, exc))
def apply_parameters(self):
'''

2
gpoa/frontend/gsettings_applier.py
View File

@ -86,7 +86,7 @@ class gsettings_applier_user(applier_frontend):
gsettings_filter = '{}%'.format(self.__registry_branch)
self.gsettings_keys = self.storage.filter_hkcu_entries(self.sid, gsettings_filter)
self.gsettings = list()
self.__module_enabled = check_module_enabled(self.storage, self.__module_name, self.__module_enabled)
self.__module_enabled = check_enabled(self.storage, self.__module_name, self.__module_enabled)
def run(self):
for setting in self.gsettings_keys:

2
gpoa/frontend/package_applier.py
View File

@ -91,7 +91,7 @@ class package_applier_user(applier_frontend):
self.install_packages_setting = self.storage.filter_hkcu_entries(self.sid, install_branch)
self.remove_packages_setting = self.storage.filter_hkcu_entries(self.sid, remove_branch)
self.__module_enabled = check_module_enabled(self.storage, self.__module_name, self.__module_enabled)
self.__module_enabled = check_enabled(self.storage, self.__module_name, self.__module_enabled)
def user_context_apply(self):
'''

2
gpoa/frontend/polkit_applier.py
View File

@ -87,7 +87,7 @@ class polkit_applier_user(applier_frontend):
logging.debug(slogm('Deny_All setting not found'))
self.policies = []
self.policies.append(polkit(template_file, template_vars, self.username))
self.__module_enabled = check_module_enabled(self.storage, self.__module_name, self.__module_enabled)
self.__module_enabled = check_enabled(self.storage, self.__module_name, self.__module_enabled)
def user_context_apply(self):
pass