[SCM] flumotion/master: Add patch to fix override internal Twisted interface. Closes: bug#672404. Thanks to John Bazik.

js at users.alioth.debian.org js at users.alioth.debian.org
Thu May 31 12:21:01 UTC 2012


The following commit has been merged in the master branch:
commit 8a49f68ca994ab48e09cfbaed935fbad9112082d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu May 31 12:54:47 2012 +0200

    Add patch to fix override internal Twisted interface. Closes: bug#672404. Thanks to John Bazik.

diff --git a/debian/patches/series b/debian/patches/series
index 67399c5..88b3bd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ preserve-umask.patch
 desktop-encoding-key.patch
 manpage-fixes.patch
 assert_ssl.patch
+twisted_override.patch
diff --git a/debian/patches/twisted_override.patch b/debian/patches/twisted_override.patch
new file mode 100644
index 0000000..ecbbad0
--- /dev/null
+++ b/debian/patches/twisted_override.patch
@@ -0,0 +1,16 @@
+Author: John Bazik <jsb at cs.brown.edu>
+Description: Fix override internal Twisted interface
+Bug: https://code.flumotion.com/trac/ticket/1544
+Bug-Debian: http://bugs.debian.org/672404
+Last-Updated: 2012-05-31
+--- a/flumotion/component/feed.py
++++ b/flumotion/component/feed.py
+@@ -38,7 +38,7 @@
+ class _SocketMaybeCloser(tcp._SocketCloser):
+     keepSocketAlive = False
+ 
+-    def _closeSocket(self):
++    def _closeSocket(self, orderly):
+         # We override this (from tcp._SocketCloser) so that we can close
+         # sockets properly in the normal case, but once we've passed our
+         # socket on via the FD-channel, we just close() it (not calling

-- 
flumotion packaging



More information about the pkg-multimedia-commits mailing list