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

Multiple fixes for package applier

Browse Source
This commit is contained in:
Игорь Чудов 2020-05-29 18:40:46 +04:00
parent b5b6fe7478
commit 1cc6dbb784
Signed by untrusted user: nir
GPG Key ID: 0F3883600CAE7AAC
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gpoa/frontend/package_applier.py
View File

@ -25,7 +25,6 @@ from util.rpm import (
)
from .applier_frontend import applier_frontend
from .appliers.rpm import rpm
class package_applier(applier_frontend):
__install_key_name = 'PackagesForInstall'
@ -41,21 +40,28 @@ class package_applier(applier_frontend):
self.install_packages_setting = self.storage.get_hklm_entry(install_branch)
self.install_packages = None
if self.install_packages_setting:
self.install_packages = self.install_packages_setting.split()
self.install_packages = self.install_packages_setting.data.split()
self.remove_packages_setting = self.storage.get_hklm_entry(remove_branch)
self.remove_packages = None
if self.remove_packages_setting:
self.remove_packages = self.remove_packages_setting.split()
self.remove_packages = self.remove_packages_setting.data.split()
def apply(self):
update()
if self.install_packages:
for package in self.install_packages:
install_rpm(package)
try:
install_rpm(package)
except Exception as exc:
logging.error(exc)
if self.remove_packages:
for package in self.remove_packages:
remove_rpm(package)
try:
remove_rpm(package)
except Exception as exc:
logging.error(exc)
class package_applier_user(applier_frontend):
@ -71,15 +77,15 @@ class package_applier_user(applier_frontend):
install_branch = '{}\\{}'.format(self.__hkcu_branch, self.__install_key_name)
remove_branch = '{}\\{}'.format(self.__hkcu_branch, self.__remove_key_name)
self.install_packages_setting = self.storage.get_hkcu_entry(install_branch)
self.install_packages_setting = self.storage.get_hkcu_entry(self.sid, install_branch)
self.install_packages = None
if self.install_packages_setting:
self.install_packages = self.install_packages_setting.split()
self.install_packages = self.install_packages_setting.data.split()
self.remove_packages_setting = self.storage.get_hkcu_entry(remove_branch)
self.remove_packages_setting = self.storage.get_hkcu_entry(self.sid, remove_branch)
self.remove_packages = None
if self.remove_packages_setting:
self.remove_packages = self.remove_packages_setting.split()
self.remove_packages = self.remove_packages_setting.data.split()
def user_context_apply(self):
'''
@ -92,13 +98,18 @@ class package_applier_user(applier_frontend):
Install software assigned to specified username regardless
which computer he uses to log into system.
'''
update()
if self.install_packages:
update()
for package in self.install_packages:
install_rpm(package)
try:
install_rpm(package)
except Exception as exc:
logging.debug(exc)
if self.remove_packages:
update()
for package in self.remove_packages:
remove_rpm(package)
try:
remove_rpm(package)
except Exception as exc:
logging.debug(exc)