python-x2go.git - twofactorauth (branch) updated: 0.0.36.0-2-gf250d19 - x2go-commits

14 Sep 2013

The branch, twofactorauth has been updated
       via  f250d1942ee54c112a72cf9f6ddda476300bd38f (commit)
      from  d81cc04aca04d92944e183e9f79c026d4441f7d1 (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:
 x2go/pulseaudio.py |   29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

The diff of changes is:

diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py
index 1441669..611b838 100644
--- a/x2go/pulseaudio.py
+++ b/x2go/pulseaudio.py
@@ -75,6 +75,7 @@ class X2goPulseAudio(threading.Thread):
         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',
@@ -86,12 +87,12 @@ class X2goPulseAudio(threading.Thread):
         if _X2GOCLIENT_OS == 'Windows':
             _stdin = file('nul', 'r')
             _shell = True
-        p = subprocess.Popen(cmd_line,
-                             stdin=_stdin,
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.STDOUT,
-                             shell=_shell,
-                            )
+        p = subprocess.call(cmd_line,
+                            stdin=_stdin,
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.STDOUT,
+                            shell=_shell,
+                           )
         gevent.sleep(5)
         _is_alive = p and (p.poll() is None)
         if self.client_instance and not _is_alive:
@@ -107,18 +108,12 @@ class X2goPulseAudio(threading.Thread):
                 self.client_instance.HOOK_pulseaudio_server_died()
 
         self.logger('terminating running PulseAudio server', loglevel=log.loglevel_DEBUG)
-        try:
-            p.terminate()
-        except WindowsError:
-            pass
-
         p = subprocess.call(['pulseaudio', '-k', ],
-                             stdin=_stdin,
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.STDOUT,
-                             shell=_shell,
-                            )
-        
+                            stdin=_stdin,
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.STDOUT,
+                            shell=_shell,
+                           )
 
     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).

    