[X2Go-Commits] [python-x2go] 01/01: After calling x2gomountdirs, write stdout and _stderr_ to the logging instance.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit ef9d36f495f18dc83c802a3a6b0881903329a25a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jan 9 01:15:34 2015 +0100

    After calling x2gomountdirs, write stdout and _stderr_ to the logging instance.
---
 debian/changelog                |    2 ++
 x2go/backends/terminal/plain.py |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 03fcf56..4dcb893 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ python-x2go (0.5.0.3-0x2go1) UNRELEASED; urgency=medium
     - Catch EOFError in x2go_forward_tunnel_handle().
     - Only sync password and passphrase if we do not enforce password
       authentication.
+    - After calling x2gomountdirs, write stdout and _stderr_ to
+      the logging instance.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 13:15:44 +0100
 
diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py
index 6c4e924..d025c99 100644
--- a/x2go/backends/terminal/plain.py
+++ b/x2go/backends/terminal/plain.py
@@ -935,7 +935,11 @@ class X2GoTerminalSession(object):
 
             (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line)
             _stdout = stdout.read().split('\n')
-            self.logger('x2gomountdirs output is: %s' % _stdout, log.loglevel_NOTICE)
+            if _stdout[0]:
+                self.logger('x2gomountdirs stdout is: %s' % _stdout, log.loglevel_NOTICE)
+            _stderr = stderr.read().split('\n')
+            if _stderr[0]:
+                self.logger('x2gomountdirs stderr is: %s' % _stderr, log.loglevel_WARNING)
 
         except:
             self._share_local_folder_lock.release()

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git