[X2go-Commits] pyhoca-cli.git - build-main (branch) updated: 0.1.4.0-4-g0ec13f5

[X2go dev team]

The branch, build-main has been updated
       via  0ec13f5a3e0e46660f19cc041288e72f8e27e3e5 (commit)
       via  2f472c5de266e7b753ba7af4eb0af884f737c0c5 (commit)
      from  44707167ff93033439b8bf61b5f2e5fd5e88b042 (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       |   12 ++++++++++--
 man/man1/pyhoca-cli.1  |    3 +++
 pyhoca-cli             |    5 +++++
 pyhoca/cli/frontend.py |    5 ++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6e7903e..97c78d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-pyhoca-cli (0.1.4.0-0~x2go2) UNRELEASED; urgency=low
+pyhoca-cli (0.1.4.1-0~x2go1) UNRELEASED; urgency=low
+
+  * New upstream version (0.1.4.1):
+    - Fix for Ctrl-C comment when sharing a desktop.
+    - Add --quiet option to disable any kind of log output.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 05 Jul 2011 21:22:32 +0200
+
+pyhoca-cli (0.1.4.0-0~x2go2) unstable; urgency=low
 
   * Already prepare for new upstream version (0.1.4.1):
     - README/TODO update.
   * Depend on Python X2go 0.1.1.2.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 04 Jul 2011 20:10:26 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 05 Jul 2011 21:22:28 +0200
 
 pyhoca-cli (0.1.4.0-0~x2go4) unstable; urgency=low
 
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index ef69c0f..7fa18a0 100644
--- a/man/man1/pyhoca-cli.1
+++ b/man/man1/pyhoca-cli.1
@@ -43,6 +43,9 @@ Display a help with all available command line options and exit.
 \*(T<\fB\-V, \-\-version\fR\*(T> 
 Output version information and exit.
 .TP 
+\*(T<\fB\-d, \-\-quiet\fR\*(T> 
+No output to stdout at all!
+.TP 
 \*(T<\fB\-d, \-\-debug\fR\*(T> 
 Enable debugging output.
 .TP 
diff --git a/pyhoca-cli b/pyhoca-cli
index 9838a98..34fb297 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -103,6 +103,7 @@ action_options =   [
 # debug options...
 debug_options =  [ 
                    {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable application debugging code', },
+                   {'args':['--quiet'], 'default': False, 'action': 'store_true', 'help': 'disable any kind of log output', },
                    {'args':['--libdebug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of the underlying Python X2go module', },
                    {'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2go\'s sFTP server code (very verbose, and even promiscuous)', },
                    {'args':['-V', '--version'], 'default': False, 'action': 'store_true', 'help': 'print version number and exit', },
@@ -194,6 +195,10 @@ Possible values for the --pack NX option are:
     if a.libdebug:
         liblogger.set_loglevel_debug()
 
+    if a.quiet:
+        logger.set_loglevel_quiet()
+        liblogger.set_loglevel_quiet()
+
     if a.libdebug_sftpxfer:
         liblogger.enable_debug_sftpxfer()
 
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 8b58146..8931e3d 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -377,7 +377,10 @@ 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, )
-                self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, )
+                if self.args.share_desktop:
+                    self._pyhoca_logger("Press CTRL+C to end desktop sharing for this session...", loglevel=x2go.loglevel_NOTICE, )
+                else:
+                    self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, )
                 try:
 
                     session_duration = 0


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)).