diff --git a/README b/README index 9581d01..4bb5063 100644 --- a/README +++ b/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: diff --git a/data/login.d/00init b/data/login.d/00init index 6a461fd..876c171 100644 --- a/data/login.d/00init +++ b/data/login.d/00init @@ -28,3 +28,4 @@ then done kill -9 $XMESPID &>/dev/null fi +exit 0 diff --git a/data/login.d/20desktop b/data/login.d/20desktop index f9d3a2c..1f3fc6c 100644 --- a/data/login.d/20desktop +++ b/data/login.d/20desktop @@ -28,3 +28,4 @@ then exit 1 fi fi +exit 0 diff --git a/data/logout.d/00init b/data/logout.d/00init index f071741..b73ae14 100644 --- a/data/logout.d/00init +++ b/data/logout.d/00init @@ -15,3 +15,4 @@ # set background color xsetroot -solid rgb:17/0b/0a +exit 0 diff --git a/pym/cl_desktop.py b/pym/cl_desktop.py index 8ce922f..4b32790 100644 --- a/pym/cl_desktop.py +++ b/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 diff --git a/pym/cl_share_cmd.py b/pym/cl_share_cmd.py index e1cf764..d06606d 100644 --- a/pym/cl_share_cmd.py +++ b/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 not self.logicObj.clVars.SetWriteVar(k,v): - 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): diff --git a/pym/cl_vars_desktop.py b/pym/cl_vars_desktop.py index 5492da3..1cced2a 100644 --- a/pym/cl_vars_desktop.py +++ b/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 = {} diff --git a/setup.py b/setup.py index dd95ab3..67d1e72 100755 --- a/setup.py +++ b/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 = []