This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit fe1e2965ccf065b98fa4ba0462c08640d3407bf5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 2 07:38:33 2020 +0100 Make build (more) reproducible: no builddir in python-x2go-doc. --- debian/changelog | 4 +++- x2go/client.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 84eb825..c424101 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ python-x2go (0.6.1.4-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mike Gabriel ] + * New upstream version (0.6.1.4): + - Make build (more) reproducible: no builddir in python-x2go-doc. -- X2Go Release Manager <git-admin@x2go.org> Wed, 01 Jan 2020 20:25:50 +0100 diff --git a/x2go/client.py b/x2go/client.py index 100852c..e2d2447 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -200,7 +200,7 @@ class X2GoClient(object): auto_register_sessions=False, no_auto_reg_pubapp_sessions=False, refresh_interval=5, - pulseaudio_installdir=os.path.join(os.getcwd(), 'pulseaudio'), + pulseaudio_installdir=None, logger=None, loglevel=log.loglevel_DEFAULT): """\ :param control_backend: X2Go control session backend to use @@ -304,6 +304,8 @@ class X2GoClient(object): self.sessions_rootdir = os.path.normpath(self.sessions_rootdir) self.ssh_rootdir = os.path.normpath(self.ssh_rootdir) + if pulseaudio_installdir == None: + pulseaudio_installdir = os.path.join(os.getcwd(), 'pulseaudio'), self.pulseaudio_installdir = os.path.normpath(pulseaudio_installdir) if self.client_rootdir is not None: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git