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

Folders applier: Fixed regression and added path expansion

Browse Source
This commit is contained in:
Игорь Чудов 2020-08-13 08:16:48 +04:00
parent 53ad06b787
commit 2bcfd75a5b
Signed by untrusted user: nir
GPG Key ID: 0F3883600CAE7AAC
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gpoa/frontend/appliers/folder.py
View File

@ -24,6 +24,7 @@ from gpt.folders import (
FileAction
, action_letter2enum
)
from util.windows import expand_windows_var
def remove_dir_tree(path, delete_files=False, delete_folder=False, delete_sub_folders=False):
for entry in path.iterdir():
@ -45,8 +46,8 @@ def str2bool(boolstr):
return False
class Folder:
def __init__(self, folder_object):
self.folder_path = Path(folder_object.path)
def __init__(self, folder_object, username):
self.folder_path = Path(expand_windows_var(folder_object.path, username).replace('\\', '/'))
self.action = action_letter2enum(folder_object.action)
self.delete_files = str2bool(folder_object.delete_files)
self.delete_folder = str2bool(folder_object.delete_folder)
@ -61,7 +62,7 @@ class Folder:
self.delete_folders,
self.delete_sub_folders)
def action(self):
def act(self):
if self.action == FileAction.CREATE:
self._create_action()
if self.action == FileAction.UPDATE:

4
gpoa/frontend/folder_applier.py
View File

@ -65,8 +65,8 @@ class folder_applier_user(applier_frontend):
def run(self):
for directory_obj in self.folders:
fld = Folder(directory_obj)
fld.action()
fld = Folder(directory_obj, self.username)
fld.act()
def admin_context_apply(self):
if self.__module_enabled: