This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 837a73c Windows: On XP & Server 2003 (R2), prevent high PulseAudio CPU usage by lowering its CPU priority to "normal" (Fixes: #537) new d68f163 make the TeKi client startup once more more robust... new 74c5b68 Rename LICENSE.txt to COPYING. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: LICENSE.txt => COPYING | 0 debian/changelog | 1 + python-x2go.spec | 2 +- x2go/telekinesis.py | 48 ++++++++++++++++++++++++------------------------ 4 files changed, 26 insertions(+), 25 deletions(-) rename LICENSE.txt => COPYING (100%) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit d68f163ab9c2e00e20b35a1691230cd13e4188d1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 2 22:53:13 2014 +0200 make the TeKi client startup once more more robust... --- x2go/telekinesis.py | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/x2go/telekinesis.py b/x2go/telekinesis.py index f14c4e7..74f6097 100644 --- a/x2go/telekinesis.py +++ b/x2go/telekinesis.py @@ -219,9 +219,6 @@ class X2GoTelekinesisClient(threading.Thread): self._keepalive = True self.tekiclient = None - if self.session_info is None or self.ssh_transport is None: - return None - try: os.makedirs(self.session_info.local_container) except OSError, e: @@ -249,31 +246,31 @@ class X2GoTelekinesisClient(threading.Thread): cmd_line = self._generate_cmdline() - if self.session_info and self.session_info.local_container: - self.tekiclient_log_stdout = open('%s/%s' % (self.session_info.local_container, self.tekiclient_log, ), 'a') - self.tekiclient_log_stderr = open('%s/%s' % (self.session_info.local_container, self.tekiclient_log, ), 'a') - self.logger('forking threaded subprocess: %s' % " ".join(cmd_line), loglevel=log.loglevel_DEBUG) + self.tekiclient_log_stdout = open('%s/%s' % (self.session_info.local_container, self.tekiclient_log, ), 'a') + self.tekiclient_log_stderr = open('%s/%s' % (self.session_info.local_container, self.tekiclient_log, ), 'a') + self.logger('forking threaded subprocess: %s' % " ".join(cmd_line), loglevel=log.loglevel_DEBUG) - while not self.tekiclient: - gevent.sleep(.2) - p = self.tekiclient = subprocess.Popen(cmd_line, - env=self.TEKICLIENT_ENV, - stdin=None, - stdout=self.tekiclient_log_stdout, - stderr=self.tekiclient_log_stderr, - shell=False) + while not self.tekiclient: + gevent.sleep(.2) + p = self.tekiclient = subprocess.Popen(cmd_line, + env=self.TEKICLIENT_ENV, + stdin=None, + stdout=self.tekiclient_log_stdout, + stderr=self.tekiclient_log_stderr, + shell=False) - while self._keepalive: - gevent.sleep(1) + while self._keepalive: + gevent.sleep(1) - try: - p.terminate() - self.logger('terminating Telekinesis client: %s' % p, loglevel=log.loglevel_DEBUG) - except OSError, e: - if e.errno == 3: - # No such process - pass + try: + p.terminate() + self.logger('terminating Telekinesis client: %s' % p, loglevel=log.loglevel_DEBUG) + except OSError, e: + if e.errno == 3: + # No such process + pass + # once all is over... self.tekiclient = None def _update_local_tekictrl_socket(self, port): @@ -304,6 +301,9 @@ class X2GoTelekinesisClient(threading.Thread): # set up Telekinesis data channel first... (via an SSHFS mount) self.logger('Connecting Telekinesis data channel first via SSHFS host=127.0.0.1, port=%s.' % (self.session_info.tekidata_port,), loglevel=log.loglevel_DEBUG) + if self.session_info is None or self.ssh_transport is None or not self.session_info.local_container: + return None, False + try: if self.ssh_transport.getpeername()[0] in ('::1', '127.0.0.1', 'localhost', 'localhost.localdomain'): self.local_tekidata_port += 10000 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 74c5b68d67bd9a29e1d29bbe8436661b8e08b70d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 9 20:06:54 2014 +0200 Rename LICENSE.txt to COPYING. --- LICENSE.txt => COPYING | 0 debian/changelog | 1 + python-x2go.spec | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/LICENSE.txt b/COPYING similarity index 100% rename from LICENSE.txt rename to COPYING diff --git a/debian/changelog b/debian/changelog index bfb39f1..7e0f6a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,6 +76,7 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low subsystem. - Newly understand our own Paramiko/SSH forwarding tunnel code. Become aware of handling multiple connects on the same tunnel. + - Rename LICENSE.txt to COPYING. * debian/control: + Add dependencies: python-requests, python-simplejson. * python-x2go.spec: diff --git a/python-x2go.spec b/python-x2go.spec index c7b3860..047ebc5 100644 --- a/python-x2go.spec +++ b/python-x2go.spec @@ -108,7 +108,7 @@ popd %files -%doc LICENSE.txt README* TODO +%doc COPYING README* TODO %{python_sitelib}/* %files doc -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org