1
0
mirror of https://github.com/altlinux/gpupdate.git synced 2025-03-21 18:50:38 +03:00

Fixed premature removal of double slash

This commit is contained in:
Valery Sinelnikov 2024-03-13 16:13:26 +04:00
parent 3794ffa5be
commit 9b4527d334
2 changed files with 2 additions and 2 deletions

View File

@ -51,7 +51,7 @@ def str2bool(boolstr):
class Folder:
def __init__(self, folder_object, username=None):
folder_path = expand_windows_var(folder_object.path, username).replace('\\', '/')
folder_path = expand_windows_var(folder_object.path, username).replace('\\', '/').replace('//', '/')
if username:
folder_path = folder_path.replace(get_homedir(username), '')
self.folder_path = Path(get_homedir(username)).joinpath(folder_path if folder_path [0] != '/' else folder_path [1:])

View File

@ -317,7 +317,7 @@ def expand_windows_var(text, username=None):
for var in variables.keys():
result = result.replace('%{}%'.format(var),
variables[var] if variables[var][-1] == '/'
else variables[var] +'/').replace('//','/')
else variables[var] +'/')
return result