From bd9ccf2435d9e216c87a05416b8be253e44d329a Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 15 Oct 2010 10:14:43 +0400 Subject: [PATCH 1/6] Add ability set empty values for variables. --- pym/cl_share_cmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/cl_share_cmd.py b/pym/cl_share_cmd.py index e1cf764..ec77fa2 100644 --- a/pym/cl_share_cmd.py +++ b/pym/cl_share_cmd.py @@ -57,7 +57,7 @@ class share_cmd(color_print, _error): for val in vals.split(','): k,o,v = val.partition('=') if self.logicObj.clVars.exists(k): - if not self.logicObj.clVars.SetWriteVar(k,v): + if self.logicObj.clVars.SetWriteVar(k,v) == False: return False else: self.printERROR(_('variable %s not found')%k) From dd294418c7d06fd61d4f4d82092647a99f803b39 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 18 Oct 2010 11:12:21 +0400 Subject: [PATCH 2/6] Increase version. --- pym/cl_desktop.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/cl_desktop.py b/pym/cl_desktop.py index b2379ec..6d5e0e0 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.0.1" __app__ = "calculate-desktop" import os diff --git a/setup.py b/setup.py index dd95ab3..72d5d2d 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.0.1" data_files = [] From 458e8bd296fc57d284ea704b6797c7a5db7c3aed Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 28 Oct 2010 09:25:05 +0400 Subject: [PATCH 3/6] Increase version. --- README | 2 +- pym/cl_desktop.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/pym/cl_desktop.py b/pym/cl_desktop.py index 6d5e0e0..376655a 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.1" +__version__ = "2.2.1" __app__ = "calculate-desktop" import os diff --git a/setup.py b/setup.py index 72d5d2d..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.1" +__version__ = "2.2.1" data_files = [] From 5c81571d0f712ade9e1c27ed8c72d54a68520acc Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 10 Nov 2010 13:07:54 +0300 Subject: [PATCH 4/6] Unhide hr_laptop_model. --- pym/cl_vars_desktop.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pym/cl_vars_desktop.py b/pym/cl_vars_desktop.py index 6a8cba9..54e13b7 100644 --- a/pym/cl_vars_desktop.py +++ b/pym/cl_vars_desktop.py @@ -68,6 +68,7 @@ class Data: cl_env_path = {} cl_root_path = {'mode':"w"} hr_laptop = {} + hr_laptop_model = {} hr_virtual = {} os_linux_name = {} os_linux_shortname = {} From 9d78fbd55f043831e1803d699fc21aacf4596be5 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 22 Nov 2010 14:26:10 +0300 Subject: [PATCH 5/6] Change syntax --set. --- pym/cl_share_cmd.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pym/cl_share_cmd.py b/pym/cl_share_cmd.py index ec77fa2..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 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): From cf2caba6ee4868b2b7d9b2f010371aaaf2b6a4cc Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 30 Nov 2010 11:45:40 +0300 Subject: [PATCH 6/6] Add "exit 0" for all login,logout scripts. --- data/login.d/00init | 1 + data/login.d/20desktop | 1 + data/logout.d/00init | 1 + 3 files changed, 3 insertions(+) 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