[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#771181: marked as done (unblock: python-x2go/0.5.0.1-2)



Your message dated Thu, 27 Nov 2014 18:38:41 +0100
with message-id <547761A1.9040600@thykier.net>
and subject line Re: Bug#771181: unblock: python-x2go/0.5.0.1-2
has caused the Debian Bug report #771181,
regarding unblock: python-x2go/0.5.0.1-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
771181: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771181
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package python-x2go

This version (0.5.0.1-2) adds two patches from upstream that


(a) Fix X2Go Desktop Sharing (patch 0002_) for Python X2Go (#770976)

and

(b) Provide more stability on bad internet links (where connections might
timeout/disrupt from time to time). The patch (0001_) for this issue has
not been documented as a Debian bug, but since I added this fix upstream,
I experience far less problems with PyHoca-GUI (a GUI tool using the
Python X2Go module internally).


unblock python-x2go/0.5.0.1-2

-- System Information:
Debian Release: jessie/sid
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru python-x2go-0.5.0.1/debian/changelog python-x2go-0.5.0.1/debian/changelog
--- python-x2go-0.5.0.1/debian/changelog	2014-10-21 01:12:41.000000000 +0200
+++ python-x2go-0.5.0.1/debian/changelog	2014-11-27 12:19:50.000000000 +0100
@@ -1,3 +1,14 @@
+python-x2go (0.5.0.1-2) unstable; urgency=medium
+
+  * debian/patches:
+    + Add 0001_catch-connection-exception-during-session-startup.patch. Catch
+      exceptions raised by connection failures during session
+      startup/resumption.
+    + Add 0002_fix-desktop-sharing.patch. Fix (cross-)user desktop sharing.
+      (Closes: #770976).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Thu, 27 Nov 2014 12:18:47 +0100
+
 python-x2go (0.5.0.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru python-x2go-0.5.0.1/debian/patches/0001_catch-connection-exception-during-session-startup.patch python-x2go-0.5.0.1/debian/patches/0001_catch-connection-exception-during-session-startup.patch
--- python-x2go-0.5.0.1/debian/patches/0001_catch-connection-exception-during-session-startup.patch	1970-01-01 01:00:00.000000000 +0100
+++ python-x2go-0.5.0.1/debian/patches/0001_catch-connection-exception-during-session-startup.patch	2014-11-27 12:14:46.000000000 +0100
@@ -0,0 +1,43 @@
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Wed, 12 Nov 2014 05:16:40 +0000 (+0100)
+Subject: Catch control session disconnects during session's run_command call.
+X-Git-Url: http://code.x2go.org/gitweb?p=python-x2go.git;a=commitdiff_plain;h=6c6c3fa7fb919af0924d91adf10bb4806e3e1a37
+
+Catch control session disconnects during session's run_command call.
+---
+
+diff --git a/x2go/session.py b/x2go/session.py
+index 22760e4..b0e1d84 100644
+--- a/x2go/session.py
++++ b/x2go/session.py
+@@ -1994,7 +1994,13 @@ class X2GoSession(object):
+ 
+                 # only run the session startup command if we do not resume...
+                 if _new_session:
+-                    self.has_terminal_session() and self.terminal_session.run_command(env=self.session_environment)
++                    try:
++                        self.has_terminal_session() and self.terminal_session.run_command(env=self.session_environment)
++                    except x2go_exceptions.X2GoControlSessionException:
++                        self.logger('%s' % str(e), loglevel=log.loglevel_ERROR)
++                        self.HOOK_on_control_session_death()
++                        self._X2GoSession__disconnect()
++                        return False
+ 
+                 self.virgin = False
+                 self.suspended = False
+@@ -2189,7 +2195,13 @@ class X2GoSession(object):
+ 
+                 # shared desktop sessions get their startup command set by the control
+                 # session, run this pre-set command now...
+-                self.terminal_session.run_command(env=self.session_environment)
++                try:
++                    self.terminal_session.run_command(env=self.session_environment)
++                except x2go_exceptions.X2GoControlSessionException:
++                    self.logger('%s' % str(e), loglevel=log.loglevel_ERROR)
++                    self.HOOK_on_control_session_death()
++                    self._X2GoSession__disconnect()
++                    return False
+ 
+                 self.virgin = False
+                 self.suspended = False
+
diff -Nru python-x2go-0.5.0.1/debian/patches/0002_fix-desktop-sharing.patch python-x2go-0.5.0.1/debian/patches/0002_fix-desktop-sharing.patch
--- python-x2go-0.5.0.1/debian/patches/0002_fix-desktop-sharing.patch	1970-01-01 01:00:00.000000000 +0100
+++ python-x2go-0.5.0.1/debian/patches/0002_fix-desktop-sharing.patch	2014-11-27 12:15:33.000000000 +0100
@@ -0,0 +1,26 @@
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Sat, 15 Nov 2014 20:31:13 +0000 (+0100)
+Subject: Fix cross-user desktop sharing feature since introduction of clipboard mode feature.
+X-Git-Url: http://code.x2go.org/gitweb?p=python-x2go.git;a=commitdiff_plain;h=d5472a9ce4bbffd5c32248135452796ea4f9d0c1
+
+Fix cross-user desktop sharing feature since introduction of clipboard mode feature.
+---
+
+diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py
+index c902f02..1239b1e 100644
+--- a/x2go/backends/terminal/plain.py
++++ b/x2go/backends/terminal/plain.py
+@@ -1487,8 +1487,11 @@ class X2GoTerminalSession(object):
+                      str(setkbd),
+                      str(self.params.session_type),
+                      str(self.params.cmd),
+-                     str(self.params.clipboard),
+                    ]
++        if self.params.session_type != 'S':
++            cmd_line.append(
++                     str(self.params.clipboard),
++            )
+ 
+         if self.params.cmd == 'XDMCP' and self.params.xdmcp_server:
+             cmd_line = ['X2GOXDMCP=%s' % self.params.xdmcp_server] + cmd_line
+
diff -Nru python-x2go-0.5.0.1/debian/patches/README python-x2go-0.5.0.1/debian/patches/README
--- python-x2go-0.5.0.1/debian/patches/README	1970-01-01 01:00:00.000000000 +0100
+++ python-x2go-0.5.0.1/debian/patches/README	2014-08-04 20:32:31.000000000 +0200
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff -Nru python-x2go-0.5.0.1/debian/patches/series python-x2go-0.5.0.1/debian/patches/series
--- python-x2go-0.5.0.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ python-x2go-0.5.0.1/debian/patches/series	2014-11-27 12:15:43.000000000 +0100
@@ -0,0 +1,2 @@
+0001_catch-connection-exception-during-session-startup.patch
+0002_fix-desktop-sharing.patch

--- End Message ---
--- Begin Message ---
On 2014-11-27 12:47, Mike Gabriel wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Please unblock package python-x2go
> 
> This version (0.5.0.1-2) adds two patches from upstream that
> 
> 
> (a) Fix X2Go Desktop Sharing (patch 0002_) for Python X2Go (#770976)
> 
> and
> 
> (b) Provide more stability on bad internet links (where connections might
> timeout/disrupt from time to time). The patch (0001_) for this issue has
> not been documented as a Debian bug, but since I added this fix upstream,
> I experience far less problems with PyHoca-GUI (a GUI tool using the
> Python X2Go module internally).
> 
> 
> unblock python-x2go/0.5.0.1-2
> 
> [...]
> 

Unblocked, thanks.

~Niels

--- End Message ---

Reply to: