[X2Go-Commits] [x2goclient] 63/94: moving setproctitle stanze further up, fixed typo

[git-admin at x2go.org]

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

x2go pushed a commit to annotated tag 0.1.4.0
in repository x2goclient.

commit bdf71da2a41cbcd042c61db71d3c2bf38a0a80a3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 17 11:50:50 2011 +0200

    moving setproctitle stanze further up, fixed typo
---
 pyhoca-cli | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pyhoca-cli b/pyhoca-cli
index 8911499a..c00b6b39 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -35,6 +35,17 @@ if app.startswith('./'):
     sys.path.insert(0, os.path.join(os.path.dirname(__file__)))
     os.environ['PYTHONX2GO_LOCAL'] = '1'
 
+PROG_NAME = os.path.basename(sys.argv[0])
+PROG_PID  = os.getpid()
+PROG_OPTIONS = sys.argv[1:]
+_password_index = PROG_OPTIONS.index('--password')+1
+PROG_OPTIONS[_password_index] = "XXXXXXXX"
+
+from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS
+if _X2GOCLIENT_OS in ('Linux', 'Mac'):
+    import setproctitle
+    setproctitle.setproctitle("%s %s" % (PROG_NAME, " ".join(PROG_OPTIONS)))
+
 import time
 import pprint
 import argparse
@@ -51,19 +62,8 @@ from x2go.defaults import DEFAULT_PDFSAVE_LOCATION
 from x2go.defaults import DEFAULT_PRINTCMD_CMD
 
 from pyhoca.cli import current_home, PyHocaCLI, runtime_error
-from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS
 
 # version information
-PROG_NAME = os.path.basename(sys.argv[0])
-PROG_PID  = os.getpid()
-PROG_OPTIONS = sys.argv[1:]
-_password_index = PROG_OPTIONS.index('--password')+1
-PROG_OPTIONS[_password_index] = "XXXXXXXX"
-
-if _X2GOCLIENT_OS in ('Linux', 'Mac'):
-    import setproctitle
-    setproctitle.setproctitle("%s %s" % (PROG_NAME, " ".join(PROG_OPTIONS)))
-
 from pyhoca.cli import __VERSION__ as _version
 VERSION=_version
 VERSION_TEXT="""
@@ -190,7 +190,7 @@ Possible values for the --pack NX option are:
     if a.libdebug_sftpxfer:
         liblogger.enable_debug_sftpxfer()
 
-    if a.password and _X2GOCLIENT_OS == "Windows"
+    if a.password and _X2GOCLIENT_OS == "Windows":
         runtime_error("The --password option is forbidden on Windows platforms", parser=p, exitcode=222)
 
     if a.version:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git