|
|
|
@ -75,9 +75,9 @@ class Desktop:
|
|
|
|
|
os.symlink(source,target)
|
|
|
|
|
try:
|
|
|
|
|
if not mountEcryptfs(userName,userPwd,userDir):
|
|
|
|
|
raise DesktopError(_("Failed to mount ecrypt"))
|
|
|
|
|
raise DesktopError(_("Failed to mount ecrypted data"))
|
|
|
|
|
except CommonError as e:
|
|
|
|
|
raise DesktopError(_("Failed to mount ecrypt")+": \"%s\""%str(e))
|
|
|
|
|
raise DesktopError(_("Failed to mount ecrypted data")+": \"%s\""%str(e))
|
|
|
|
|
else:
|
|
|
|
|
tf = None
|
|
|
|
|
try:
|
|
|
|
@ -317,7 +317,7 @@ class Desktop:
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
@safetyWrapper(native_errors=(TemplatesError,DesktopError),
|
|
|
|
|
man_int=__("Logout manually interrupted"),
|
|
|
|
|
man_int=__("Logout aborted"),
|
|
|
|
|
post_action=umountUserRes,
|
|
|
|
|
success_message=__("The user logged out from the session!"),
|
|
|
|
|
failed_message=__("Unable to logout the user"))
|
|
|
|
@ -342,10 +342,10 @@ class Desktop:
|
|
|
|
|
logoutCommand = "/usr/bin/qdbus org.gnome.SessionManager " \
|
|
|
|
|
"/org/gnome/SessionManager Logout 1"
|
|
|
|
|
else:
|
|
|
|
|
raise DesktopError(_("Unable detect X session"))
|
|
|
|
|
raise DesktopError(_("Unable to detect the X session"))
|
|
|
|
|
if process("su",urLogin,"-c",
|
|
|
|
|
("DISPLAY=:%s "%display)+logoutCommand).failed():
|
|
|
|
|
raise DesktopError(_("Unable send logout command"))
|
|
|
|
|
raise DesktopError(_("Unable to send the logout command"))
|
|
|
|
|
for i in range(0,20):
|
|
|
|
|
if filter(lambda x: "xdm/xdm\x00--logout" in x,
|
|
|
|
|
getRunCommands()):
|
|
|
|
|