master
Самоукин Алексей 15 years ago
parent a42cd5faef
commit 3d2e5c3090

@ -2269,12 +2269,12 @@ or ld_bind_dn or ld_bind_pw")
try: try:
for rmFile in filesRemove: for rmFile in filesRemove:
rmPath = os.path.join(homeDir, rmFile) rmPath = os.path.join(homeDir, rmFile)
if os.path.isdir(rmPath): if if os.path.islink(rmPath):
os.rmdir(rmPath) os.unlink(rmPath)
elif os.path.isfile(rmPath): elif os.path.isfile(rmPath):
os.remove(rmPath) os.remove(rmPath)
elif os.path.islink(rmPath): elif os.path.isdir(rmPath):
os.unlink(rmPath) os.rmdir(rmPath)
else: else:
os.remove(rmPath) os.remove(rmPath)
except: except:
@ -2559,7 +2559,9 @@ or ld_bind_dn or ld_bind_pw")
# файлов # файлов
pathListFile = os.path.join(homeProfile, pathListFile = os.path.join(homeProfile,
self.listProfFile) self.listProfFile)
self.removeFilesInProfile(homeDir, pathListFile) if not self.removeFilesInProfile(homeDir, pathListFile):
self.errorAndUnmountUserRes = True
return False
else: else:
if name == "remote_profile": if name == "remote_profile":
flagIncrArch = False flagIncrArch = False

Loading…
Cancel
Save