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

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

Loading…
Cancel
Save