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 a492d5941429c3179caa4bbe99a9534ac622f3cc Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Fri Oct 29 12:21:30 2010 +0000 * pyhoca-cli is currently broken... * temporarily removed symlinks to local Python X2go copy * initial bugfixing git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@16 cdb5e8f1-f799-4276-8919-bce57fd91830 --- pyhoca-cli | 13 ++++++------- pyhoca/cli/frontend.py | 6 ++++-- pyhoca/cli/x2go | 1 - x2go | 1 - 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index fdda7332..632c0fa9 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -45,7 +45,7 @@ from x2go.defaults import DEFAULT_PDFVIEW_CMD from x2go.defaults import DEFAULT_PDFSAVE_LOCATION from x2go.defaults import DEFAULT_PRINTCMD_CMD -from pyhoca.cli import PyHocaCLI +from pyhoca.cli import current_home, PyHocaCLI # version information PROG_NAME = os.path.basename(sys.argv[0]) @@ -61,7 +61,6 @@ VERSION: %s """ % (PROG_NAME, PROG_PID, VERSION) PRINT_ACTIONS = X2GO_PRINT_ACTIONS.keys() -print_actions_args = {} logger = x2go.X2goLogger(tag='MAIN') liblogger = x2go.X2goLogger() @@ -138,7 +137,6 @@ def version(): def parseargs(): global DEBUG - global print_action_args global logger p = argparse.ArgumentParser(description='X2go command line client implemented in Python.',\ @@ -234,14 +232,15 @@ Possible values for the --pack NX option are: if a.print_cmd is None and a.print_action == 'PRINTCMD': a.print_cmd = DEFAULT_PRINTCMD_CMD + a.print_action_args = {} if a.pdfview_cmd: - print_action_args={'pdfview_cmd': a.pdfview_cmd, } + a.print_action_args={'pdfview_cmd': a.pdfview_cmd, } elif a.save_to_folder: - print_action_args={'save_to_folder': a.save_to_folder, } + a.print_action_args={'save_to_folder': a.save_to_folder, } elif a.printer: - print_action_args={'printer': a.printer, } + a.print_action_args={'printer': a.printer, } elif a.print_cmd: - print_action_args={'print_cmd': a.print_cmd, } + a.print_action_args={'print_cmd': a.print_cmd, } ### take care of compatibility options # option --use-sound yes as synonomyn for --sound diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 7c41b537..15a85d74 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -162,11 +162,13 @@ class PyHocaCLI(x2go.X2goClient): self.args = args if logger is None: logger = x2go.X2goLogger(tag='PyHocaCLI') + else: + self.logger = logger # initialize the X2goClient context and start the connection to the X2go server self.logger('preparing requested X2go session', x2go.loglevel_NOTICE, ) - x2go.X2goClient.__init__(logger=liblogger) + x2go.X2goClient.__init__(self, logger=liblogger) self.x2go_session_hash = self.register_session(args.server, port=int(self.args.remote_ssh_port), username=self.args.username, password=self.args.password, @@ -183,7 +185,7 @@ class PyHocaCLI(x2go.X2goClient): snd_system=self.args.sound, printing=self.args.printing, print_action=self.args.print_action, - print_action_args=print_action_args, + print_action_args=self.args.print_action_args, cmd=self.args.command) self.with_session(self.x2go_session_hash).load_host_keys(ssh_known_hosts_filename) diff --git a/pyhoca/cli/x2go b/pyhoca/cli/x2go deleted file mode 120000 index 6c7076fe..00000000 --- a/pyhoca/cli/x2go +++ /dev/null @@ -1 +0,0 @@ -../../../../python/python-x2go/trunk/x2go/ \ No newline at end of file diff --git a/x2go b/x2go deleted file mode 120000 index 74dfe276..00000000 --- a/x2go +++ /dev/null @@ -1 +0,0 @@ -../../python/python-x2go/trunk/x2go/ \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git