[X2Go-Commits] python-x2go.git - build-main (branch) updated: 0.4.0.3

X2Go dev team git-admin at x2go.org
Sun Apr 21 22:52:30 CEST 2013


The branch, build-main has been updated
       via  e05c33eff01a2f040b626a7954d90e8fd61375c2 (commit)
       via  d5df83078d9dc2c5a33b66625d62cfc98e828473 (commit)
       via  7792ed64a99ab0f8b8acb56e39a75a2946529615 (commit)
       via  e5f05db2510ed87f2be979bcaf9ed7c9cd97b20b (commit)
       via  e6964f1e693a2beabb162ca24f062ccf2fccda2e (commit)
       via  33167fc84f8ca0c7d607faee25ad9a9262272764 (commit)
       via  9ac619d8b2968ccfcd7a3e151e62fc50bc875fbb (commit)
       via  ec2880a3c14c5b8c475b2c76109a7be61412085d (commit)
      from  450da43206df524fd800f452afee38c2ec1e0abc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                |   15 ++++++++++++++-
 x2go/__init__.py                |    2 +-
 x2go/backends/profiles/_file.py |    6 +++---
 x2go/defaults.py                |    1 +
 x2go/x2go_exceptions.py         |    4 ++--
 5 files changed, 21 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ef4e0f8..b6bd1eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
+python-x2go (0.4.0.3-0~x2go1) unstable; urgency=low
+
+  * New upstream version (0.4.0.3):
+    - Fix inheritance of Paramiko/SSH exception.
+    - Make Python X2Go aware of the Cinnamon desktop shell.
+    - Fix faulty value creations for the export session profile parameter.
+      (Fixes: #162). This issue occured when the restoreexports feature
+      had been activated in the session profile.
+    - Prevent Exception when creating new session profiles. Spotted by 
+      Dick Kniep. Thanks!
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 21 Apr 2013 22:40:43 +0200
+
 python-x2go (0.4.0.2-0~x2go1) unstable; urgency=low
 
   * New upstream version (0.4.0.2):
     - Empty session profile name/id cache when adding new profiles. (Fixes:
-      #130).
+      #130, #147).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 03 Mar 2013 15:55:57 +0100
 
diff --git a/x2go/__init__.py b/x2go/__init__.py
index 17375d6..1140aa1 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -183,7 +183,7 @@ Contact
 """
 
 __NAME__    = 'python-x2go'
-__VERSION__ = '0.4.0.2'
+__VERSION__ = '0.4.0.3'
 
 from gevent import monkey
 monkey.patch_all()
diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index b5b05ff..463db0f 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
@@ -406,17 +406,15 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile):
         except X2GoProfileException:
             profile_id = section
 
-        inifiles.X2GoIniFile.update_value(self, profile_id, key, value)
-
         if key == 'name':
             profile_name = value
             current_profile_name = self.get_value(profile_id, key)
             if not profile_name:
                 raise X2GoProfileException('profile name for profile id %s may not be empty' % profile_id)
             else:
+                self._cached_profile_names = []
                 if profile_name != current_profile_name and profile_name in self.profile_names:
                     raise X2GoProfileException('a profile of name ,,%s\'\' already exists' % profile_name)
-            self._cached_profile_names = []
 
         if key == 'export' and type(value) == types.DictType:
             _strvalue = '"'
@@ -431,6 +429,8 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile):
             if _config.has_key('host') and _config['host'] != value:
                 self._profiles_need_profile_id_renewal.append(profile_id)
 
+        inifiles.X2GoIniFile.update_value(self, profile_id, key, value)
+
     def check_profile_id_or_name(self, profile_id_or_name):
         """\
         Detect the profile ID from a given string which maybe profile ID or profile name.
diff --git a/x2go/defaults.py b/x2go/defaults.py
index d6d0473..92b0906 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -375,6 +375,7 @@ pack_methods_nx3.sort()
 ##
 
 X2GO_DESKTOPSESSIONS={
+    'CINNAMON': 'cinnamon',
     'KDE': 'startkde',
     'GNOME': 'gnome-session',
     'XFCE': 'xfce4-session',
diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py
index be69208..688a8ba 100644
--- a/x2go/x2go_exceptions.py
+++ b/x2go/x2go_exceptions.py
@@ -32,9 +32,9 @@ from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
 # Python X2Go Exceptions
 AuthenticationException = paramiko.AuthenticationException
 """inherited from Python Paramiko library"""
-PasswordRequiredException = paramiko.AuthenticationException
+PasswordRequiredException = paramiko.PasswordRequiredException
 """inherited from Python Paramiko library"""
-BadHostKeyException = paramiko.AuthenticationException
+BadHostKeyException = paramiko.BadHostKeyException
 """inherited from Python Paramiko library"""
 SSHException = paramiko.SSHException
 """inherited from Python Paramiko library"""


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list