The branch, twofactorauth has been updated discards 632bd0730d2db7ba960c49eae7837cbd236d6754 (commit) via a6d746203239ffd58f4d86de4085c03b5e3ba4e4 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (632bd0730d2db7ba960c49eae7837cbd236d6754) \ N -- N -- N (a6d746203239ffd58f4d86de4085c03b5e3ba4e4) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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: README | 15 +++++++-------- x2go/pulseaudio.py | 17 ++++++++--------- 2 files changed, 15 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/README b/README index 3c36982..40922f9 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -python-x2go - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +python-x2go - Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. @@ -7,8 +7,7 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy. === What is Python X2go? === The Python X2go module integrates X2go client support into your python programmes. -Python X2go is used in the headless X2go client »pyhoca-cli« and by the tiny systray GUI -application »pyhoca-gui« +Python X2go is used in the headless X2go client »pyhoca-cli«. Python X2go takes advantages of the NX Proxy by NoMachine published under GPL. On Windows and MacOS X systems you have to make sure that you have installed a current @@ -65,7 +64,7 @@ Ubuntu: create /etc/apt/sources.list.d/nwt.list and put the following line into it: <snip> -deb http://packages.das-netzwerkteam.de/ubuntu {lucid|maverick|natty} main +deb http://packages.das-netzwerkteam.de/ubuntu {lucid|maverick} main </snip> If you run a newer Ubuntu version, replace »lucid« with your version (»maverick«, ...) @@ -81,7 +80,7 @@ Debian: create /etc/apt/sources.list.d/nwt.list and put the following line into it: <snip> -deb http://packages.das-netzwerkteam.de/debian {squeeze|wheezy|sid} main +deb http://packages.das-netzwerkteam.de/debian {squeeze|sid} main </snip> Then run the following commands as super-user root: @@ -120,10 +119,10 @@ desktop's system tray. === Repository and Feedback === -Before giving feedback take a look at http://git.x2go.org/ (project: python-x2go.git) and -check if your issues have already been solved in the HEAD of python-x2go code. +Before giving feedback take a look at http://svn.das-netzwerkteam.de/websvn and +check if you issues have already been solved in the HEAD of code. -For now, bugs can be reported via mail to mike.gabriel@das-netzwerkteam.de +For now, bugs can be reported via mail to m.gabriel@das-netzwerkteam.de light+love diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py index 34d491b..5a4a94d 100644 --- a/x2go/pulseaudio.py +++ b/x2go/pulseaudio.py @@ -25,6 +25,7 @@ __NAME__ = 'x2gopulseaudio-pylib' from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS if _X2GOCLIENT_OS == 'Windows': import wmi + import win32api # modules import os @@ -72,10 +73,7 @@ class X2goPulseAudio(threading.Thread): """ self._keepalive = True cmd = 'pulseaudio.exe' - if self.path: - cmd = os.path.join(self.path, cmd) cmd_options = [ - '-D', '-n', '-L module-native-protocol-tcp port=4713', '-L module-esound-protocol-tcp port=16001', @@ -92,6 +90,7 @@ class X2goPulseAudio(threading.Thread): stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=_shell, + cwd=self.path, ) gevent.sleep(5) _is_alive = p and (p.poll() is None) @@ -108,12 +107,12 @@ class X2goPulseAudio(threading.Thread): self.client_instance.HOOK_pulseaudio_server_died() self.logger('terminating running PulseAudio server', loglevel=log.loglevel_DEBUG) - p = subprocess.Popen(['pulseaudio', '-k', ], - stdin=_stdin, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - shell=_shell, - ) + + # there is no real kill command on Windows... + PROCESS_TERMINATE = 1 + p_handle = win32api.OpenProcess(PROCESS_TERMINATE, False, p.pid) + win32api.TerminateProcess(p_handle, 0) + win32api.CloseHandle(p_handle) def stop_thread(self): """\ hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).