[X2go-Commits] pyhoca-cli.git - master (branch) updated: 0.2.0.4-15-g825b509

[X2Go dev team]

The branch, master has been updated
       via  825b50999110441eebcb81782cd79234344ae0c3 (commit)
      from  d8f65485337578f6a0075495b13d9710cb007a1d (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 -----------------------------------------------------------------
commit 825b50999110441eebcb81782cd79234344ae0c3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 10 20:42:38 2012 +0100

    do not hint to STRG-C functionality with --from-stdin option set

-----------------------------------------------------------------------

Summary of changes:
 pyhoca/cli/frontend.py |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 0bffb01..63908e8 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -499,12 +499,15 @@ class PyHocaCLI(x2go.X2goClient):
                 session_name = self._X2goClient__get_session_name(self.x2go_session_hash)
                 self._pyhoca_logger("X2Go session is now running, the X2Go client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, )
                 self._pyhoca_logger("X2Go session name is: %s" % session_name, loglevel=x2go.loglevel_INFO, )
-                if self.args.share_desktop:
-                    self._pyhoca_logger("Press CTRL+C to end desktop sharing for this session...", loglevel=x2go.loglevel_NOTICE, )
-                elif self.args.terminate_on_ctrl_c:
-                    self._pyhoca_logger("Press CTRL+C to terminate the running session...", loglevel=x2go.loglevel_NOTICE, )
-                else:
-                    self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, )
+
+                if not self.args.from_stdin:
+
+                    if self.args.share_desktop:
+                        self._pyhoca_logger("Press CTRL+C to end desktop sharing for this session...", loglevel=x2go.loglevel_NOTICE, )
+                    elif self.args.terminate_on_ctrl_c:
+                        self._pyhoca_logger("Press CTRL+C to terminate the running session...", loglevel=x2go.loglevel_NOTICE, )
+                    else:
+                        self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, )
 
                 try:
 


hooks/post-receive
-- 
pyhoca-cli.git (Python X2Go Client (command line client))

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 "pyhoca-cli.git" (Python X2Go Client (command line client)).