mirror of
https://github.com/altlinux/gpupdate.git
synced 2025-03-06 16:58:50 +03:00
Update getting correct data for the user
This commit is contained in:
parent
2857cfb899
commit
28718e8ad6
@ -21,7 +21,7 @@ import rpm
|
|||||||
import subprocess
|
import subprocess
|
||||||
from gpoa.storage import registry_factory
|
from gpoa.storage import registry_factory
|
||||||
from util.gpoa_ini_parsing import GpoaConfigObj
|
from util.gpoa_ini_parsing import GpoaConfigObj
|
||||||
from util.util import get_uid_by_username
|
from util.util import get_uid_by_username, string_to_literal_eval
|
||||||
import logging
|
import logging
|
||||||
from util.logging import log
|
from util.logging import log
|
||||||
import argparse
|
import argparse
|
||||||
@ -53,9 +53,16 @@ class Pkcon_applier:
|
|||||||
self.remove_packages = set()
|
self.remove_packages = set()
|
||||||
if user:
|
if user:
|
||||||
pid = get_uid_by_username(user)
|
pid = get_uid_by_username(user)
|
||||||
packages_dict = GpoaConfigObj(f'/etc/dconf/db/policy{pid}.d/policy{pid}.ini')
|
#TODO: It is necessary to redo reading from the GVariant database file policy{pid}
|
||||||
self.install_packages_setting = packages_dict[self.__hklm_branch[1:]][self.__install_key_name]
|
try:
|
||||||
self.remove_packages_setting = packages_dict[self.__hklm_branch[1:]][self.__remove_key_name]
|
packages_dict = GpoaConfigObj(f'/etc/dconf/db/policy{pid}.d/policy{pid}.ini')
|
||||||
|
except:
|
||||||
|
packages_dict = {}
|
||||||
|
|
||||||
|
self.install_packages_setting = string_to_literal_eval(
|
||||||
|
packages_dict.get(self.__hklm_branch[1:], {}).get(self.__install_key_name, {}))
|
||||||
|
self.remove_packages_setting = string_to_literal_eval(
|
||||||
|
packages_dict.get(self.__hklm_branch[1:], {}).get(self.__remove_key_name, {}))
|
||||||
else:
|
else:
|
||||||
storage = registry_factory(username=user)
|
storage = registry_factory(username=user)
|
||||||
install_branch = '{}/{}'.format(self.__hklm_branch, self.__install_key_name)
|
install_branch = '{}/{}'.format(self.__hklm_branch, self.__install_key_name)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user