From 122eb5e9dd1c70db77260205a6d4ec2d924d064b Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Mon, 5 Sep 2011 16:17:24 +0400
Subject: [PATCH] Fix color=never for cl-desktop.

---
 pym/cl_desktop_cmd.py | 8 ++++----
 scripts/cl-desktop    | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pym/cl_desktop_cmd.py b/pym/cl_desktop_cmd.py
index b252bef..e27d7f7 100644
--- a/pym/cl_desktop_cmd.py
+++ b/pym/cl_desktop_cmd.py
@@ -120,10 +120,6 @@ class desktop_cmd(share_cmd):
                 errMsg = _("incorrect argument") + ":" + " %s" %" ".join(args)
                 self.optobj.error(errMsg)
                 return False
-            userName = args[0]
-            # Проверка на существование пользователя
-            if not self.logicObj.existsUser(userName):
-                return False
         if not optObj.v:
             if optObj.filter:
                 errMsg = _("incorrect option") + ":" + " %s" %"--filter" +\
@@ -139,7 +135,11 @@ class desktop_cmd(share_cmd):
 
     def setUserName(self, userName):
         """Установка имени пользователя"""
+        # Проверка на существование пользователя
+        if not self.logicObj.existsUser(userName):
+            return False
         self.logicObj.clVars.Set("ur_login", userName, True)
+        return True
 
     def createHome(self, optObj):
         """Создание домашней директории"""
diff --git a/scripts/cl-desktop b/scripts/cl-desktop
index f2de66d..ae82f23 100644
--- a/scripts/cl-desktop
+++ b/scripts/cl-desktop
@@ -42,7 +42,8 @@ if __name__ == "__main__":
     obj.setPrintNoColor(opts)
     if userName:
         # Установка имени пользователя
-        obj.setUserName(userName)
+        if not obj.setUserName(userName):
+            sys.exit(1)
     # Установка переменных
     if not obj.setVars(opts):
         sys.exit(1)