1
0
mirror of https://github.com/altlinux/gpupdate.git synced 2025-03-08 04:58:44 +03:00

Added logs with translation for package_applier

This commit is contained in:
Valery Sinelnikov 2021-10-18 12:55:08 +04:00
parent d00e99e5d4
commit c7bafc4d21
3 changed files with 32 additions and 31 deletions
gpoa
frontend
locale/ru_RU/LC_MESSAGES
messages

@ -18,7 +18,7 @@
import logging
import subprocess
from util.logging import slogm
from util.logging import slogm, log
from util.rpm import (
update
, install_rpm
@ -67,31 +67,23 @@ class package_applier(applier_frontend):
try:
subprocess.check_call(self.fulcmd)
except Exception as exc:
logging.error(exc)
logdata = dict()
logdata['msg'] = str(exc)
log('E55', logdata)
else:
try:
subprocess.Popen(self.fulcmd,close_fds=False)
except Exception as exc:
logging.error(exc)
#update()
#for package in self.install_packages_setting:
#try:
# install_rpm(package.data)
#except Exception as exc:
# logging.error(exc)
#for package in self.remove_packages_setting:
# try:
# remove_rpm(package.data)
# except Exception as exc:
# logging.error(exc)
logdata = dict()
logdata['msg'] = str(exc)
log('E55', logdata)
def apply(self):
if self.__module_enabled:
logging.debug(slogm('Running Package applier for machine'))
log('D138')
self.run()
else:
logging.debug(slogm('Package applier for machine will not be started'))
log('D139')
class package_applier_user(applier_frontend):
@ -144,17 +136,6 @@ class package_applier_user(applier_frontend):
subprocess.Popen(self.fulcmd,close_fds=False)
except Exception as exc:
logging.error(exc)
# update()
# for package in self.install_packages_setting:
# try:
# install_rpm(package.data)
# except Exception as exc:
# logging.debug(exc)
# for package in self.remove_packages_setting:
# try:
# remove_rpm(package.data)
# except Exception as exc:
# logging.debug(exc)
def admin_context_apply(self):
'''
@ -162,8 +143,8 @@ class package_applier_user(applier_frontend):
which computer he uses to log into system.
'''
if self.__module_enabled:
logging.debug(slogm('Running Package applier for user in administrator context'))
log('D140')
self.run()
else:
logging.debug(slogm('Package applier for user in administrator context will not be started'))
log('D141')

@ -204,6 +204,9 @@ msgstr "Не удалось применить ярлык к файлу с %"
msgid "Fail for applying shortcut to not absolute path"
msgstr "Не удалось применить ярлык к не абсолютному пути"
msgid "Error running pkcon_runner"
msgstr "Ошибка при запуске pkcon_runner"
# Error_end
# Debug
@ -577,7 +580,7 @@ msgid "Running Envvar applier for machine"
msgstr "Запуск применение настроек Envvar для машины"
msgid "Envvar applier for machine will not be started"
msgstr "Применение настроек Envvar не запускается"
msgstr "Применение настроек Envvar для машины не запускается"
msgid "Running Envvar applier for user in user context"
msgstr "Запуск применение настроек Envvar в контексте пользователя"
@ -585,6 +588,18 @@ msgstr "Запуск применение настроек Envvar в конте
msgid "Envvar applier for user in user context will not be started"
msgstr "Применение настроек Envvar в контексте пользователя не запускается"
msgid "Running Package applier for machine"
msgstr "Запуск установки пакетов для машины"
msgid "Package applier for machine will not be started"
msgstr "Применение установки пакетов для машины не запускается"
msgid "Running Package applier for user in administrator context"
msgstr "Запуск установки пакетов в контексте пользователя"
msgid "Package applier for user in administrator context will not be started"
msgstr "Применение установки пакетов в контексте пользователя не запускается"
# Debug_end
# Warning

@ -89,6 +89,7 @@ def error_code(code):
error_ids[52] = 'Error during attempt to read Chromium preferences for user'
error_ids[53] = 'Fail for applying shortcut to file with \'%\''
error_ids[54] = 'Fail for applying shortcut to not absolute path'
error_ids[55] = 'Error running pkcon_runner'
return error_ids.get(code, 'Unknown error code')
@ -231,6 +232,10 @@ def debug_code(code):
debug_ids[135] = 'Envvar applier for machine will not be started'
debug_ids[136] = 'Running Envvar applier for user in user context'
debug_ids[137] = 'Envvar applier for user in user context will not be started'
debug_ids[138] = 'Running Package applier for machine'
debug_ids[139] = 'Package applier for machine will not be started'
debug_ids[140] = 'Running Package applier for user in administrator context'
debug_ids[141] = 'Package applier for user in administrator context will not be started'
return debug_ids.get(code, 'Unknown debug code')