Merge branch 'master' of git.calculate.ru:/calculate-desktop

README

@@ -7,7 +7,7 @@ calculate-desktop needs the following library version installed, in order to run
     Python >= 2.5
     python-ldap >= 2.0.0
     pyxml >= 0.8
-    calculate-lib >= 2.2.0
+    calculate-lib >= 2.2.1
 
 To install calculate-desktop, just execute the install script 'setup.py'.
 Example:

data/login.d/00init

@@ -28,3 +28,4 @@ then
 	done
 	kill -9 $XMESPID &>/dev/null
 fi
+exit 0

data/login.d/20desktop

@@ -28,3 +28,4 @@ then
     exit 1
   fi
 fi
+exit 0

data/logout.d/00init

@@ -15,3 +15,4 @@
 
 # set background color
 xsetroot -solid rgb:17/0b/0a
+exit 0

pym/cl_desktop.py

@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "2.2.0.0"
+__version__ = "2.2.1"
 __app__ = "calculate-desktop"
 
 import os

pym/cl_share_cmd.py

@@ -53,15 +53,14 @@ class share_cmd(color_print, _error):
     def setVars(self, optObj):
         """Установка переменных"""
         if optObj.set:
-            for vals in optObj.set:
+            for val in optObj.set:
-                for val in vals.split(','):
+                k,o,v = val.partition('=')
-                    k,o,v = val.partition('=')
+                if self.logicObj.clVars.exists(k):
-                    if self.logicObj.clVars.exists(k):
+                    if self.logicObj.clVars.SetWriteVar(k,v) == False:
-                        if not self.logicObj.clVars.SetWriteVar(k,v):
-                            return False
-                    else:
-                        self.printERROR(_('variable %s not found')%k)
                         return False
+                else:
+                    self.printERROR(_('variable %s not found')%k)
+                    return False
         return True
 
     def writeVars(self, optObj):

pym/cl_vars_desktop.py

@@ -71,6 +71,7 @@ class Data:
     cl_env_path = {}
     cl_root_path = {'mode':"w"}
     hr_laptop = {}
+    hr_laptop_model = {}
     hr_virtual = {}
     os_linux_name = {}
     os_linux_shortname = {}

setup.py

@@ -24,7 +24,7 @@ from distutils.command.install_data import install_data
 
 
 __app__ = "calculate-desktop"
-__version__ = "2.2.0.0"
+__version__ = "2.2.1"
 
 data_files = []