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

README

@@ -7,8 +7,8 @@ calculate-client 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-desktop >= 2.2.0
+    calculate-lib >= 2.2.1
+    calculate-desktop >= 2.2.1
 
 To install calculate-client, just execute the install script 'setup.py'.
 Example:

pym/cl_client.py

@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "2.2.0.1"
+__version__ = "2.2.1"
 __app__ = "calculate-client"
 
 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 vals.split(','):
-                    k,o,v = val.partition('=')
-                    if self.logicObj.clVars.exists(k):
-                        if self.logicObj.clVars.SetWriteVar(k,v) == False:
-                            return False
-                    else:
-                        self.printERROR(_('variable %s not found')%k)
+            for val in optObj.set:
+                k,o,v = val.partition('=')
+                if self.logicObj.clVars.exists(k):
+                    if self.logicObj.clVars.SetWriteVar(k,v) == False:
                         return False
+                else:
+                    self.printERROR(_('variable %s not found')%k)
+                    return False
         return True
 
     def writeVars(self, optObj):

setup.py

@@ -22,7 +22,7 @@ import stat
 from distutils.core import setup, Extension
 from distutils.command.install_data import install_data
 
-__version__ = "2.2.0.1"
+__version__ = "2.2.1"
 __app__ = "calculate-client"