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

Fix util.util import in chromium and firefox appliers

Browse Source
This commit is contained in:
Evgeny Sinelnikov 2022-05-06 23:44:11 +04:00
parent 0e159d34d0
commit 3187b9f0f1
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gpoa/frontend/chromium_applier.py
View File

@ -24,9 +24,8 @@ from .applier_frontend import (
import logging
import json
import os
import util.util as util
from util.logging import slogm, log
from util.util import is_machine_name
from util.util import is_machine_name, get_homedir, mk_homedir_path
class chromium_applier(applier_frontend):
__module_name = 'ChromiumApplier'
@ -94,11 +93,11 @@ class chromium_applier(applier_frontend):
a good practice and used mostly by various malware.
'''
if not self._is_machine_name:
prefdir = os.path.join(util.get_homedir(self.username), self.__user_settings)
prefdir = os.path.join(get_homedir(self.username), self.__user_settings)
os.makedirs(prefdir, exist_ok=True)
prefpath = os.path.join(prefdir, 'Preferences')
util.mk_homedir_path(self.username, self.__user_settings)
mk_homedir_path(self.username, self.__user_settings)
settings = dict()
try:
with open(prefpath, 'r') as f:

7
gpoa/frontend/firefox_applier.py
View File

@ -35,8 +35,7 @@ from .applier_frontend import (
, check_enabled
)
from util.logging import slogm, log
from util.util import is_machine_name
import util.util as util
from util.util import is_machine_name, get_homedir
class firefox_applier(applier_frontend):
__module_name = 'FirefoxApplier'
@ -64,7 +63,7 @@ class firefox_applier(applier_frontend):
'''
Get directory names of Firefox profiles for specified username.
'''
profiles_ini = os.path.join(util.get_homedir(self.username), self.__user_settings_dir, 'profiles.ini')
profiles_ini = os.path.join(get_homedir(self.username), self.__user_settings_dir, 'profiles.ini')
config = configparser.ConfigParser()
config.read(profiles_ini)
@ -205,7 +204,7 @@ class firefox_applier(applier_frontend):
def user_apply(self):
profiles = self.get_profiles()
profiledir = os.path.join(util.get_homedir(self.username), self.__user_settings_dir)
profiledir = os.path.join(get_homedir(self.username), self.__user_settings_dir)
for profile in profiles:
logdata = dict()
logdata['profiledir'] = profiledir