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

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9845459e3a2fb057ba69e67daea0d6c8bf71052c
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Fri Jun 29 13:32:17 2012 +0200

    Updated patch to fix override internal Twisted interface. Closes: bug#679318. Thanks again to John Bazik

diff --git a/debian/patches/twisted_override.patch b/debian/patches/twisted_override.patch
index ecbbad0..770a025 100644
--- a/debian/patches/twisted_override.patch
+++ b/debian/patches/twisted_override.patch
@@ -2,9 +2,10 @@ 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
+Bug-Debian: http://bugs.debian.org/679318
+Last-Updated: 2012-06-29
+--- flumotion.orig/flumotion/component/feed.py
++++ flumotion/flumotion/component/feed.py
 @@ -38,7 +38,7 @@
  class _SocketMaybeCloser(tcp._SocketCloser):
      keepSocketAlive = False
@@ -14,3 +15,14 @@ Last-Updated: 2012-05-31
          # 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.orig/flumotion/twisted/fdserver.py
++++ flumotion/flumotion/twisted/fdserver.py
+@@ -173,7 +173,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