1
0
mirror of https://github.com/altlinux/gpupdate.git synced 2025-01-09 21:17:52 +03:00

Fixed directory functionality

This commit is contained in:
Valery Sinelnikov 2023-10-11 16:22:56 +04:00
parent 14c7e5db21
commit 388125415b
2 changed files with 4 additions and 2 deletions

View File

@ -44,7 +44,9 @@ def remove_dir_tree(path, delete_files=False, delete_folder=False, delete_sub_fo
return content
def str2bool(boolstr):
if boolstr and boolstr.lower() in ['true', 'yes', '1']:
if isinstance(boolstr, bool):
return boolstr
elif boolstr and boolstr.lower() in ['true', 'yes', '1']:
return True
return False

View File

@ -71,7 +71,7 @@ def read_folders(folders_file):
folders.append(fld_obj)
Dconf_registry.folders.append(folders)
return folders
def merge_folders(storage, sid, folder_objects, policy_name):