[SCM] flumotion/master: fix haveSSL assertion

zmoelnig-guest at users.alioth.debian.org zmoelnig-guest at users.alioth.debian.org
Mon Mar 5 14:28:17 UTC 2012


The following commit has been merged in the master branch:
commit af340d22e34c902ed48178ba7bdb80ccc1cca561
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Mar 5 15:12:20 2012 +0100

    fix haveSSL assertion

diff --git a/debian/patches/assert_ssl.patch b/debian/patches/assert_ssl.patch
new file mode 100644
index 0000000..2ba6ffc
--- /dev/null
+++ b/debian/patches/assert_ssl.patch
@@ -0,0 +1,29 @@
+Author: IOhannes m zmölnig
+Description: some versions of twisted seem to lack the sslEnabled attribute
+of twisted.internet.posixbase; this patch works around that
+--- flumotion.orig/flumotion/common/common.py
++++ flumotion/flumotion/common/common.py
+@@ -390,7 +390,22 @@
+     from twisted.internet import posixbase
+     from flumotion.common import errors
+ 
+-    if not posixbase.sslEnabled:
++    haveSSL=False
++
++    if not haveSSL:
++      try:
++        haveSSL=posixbase.sslEnabled
++      except AttributeError:
++        haveSSL=False
++
++    if not haveSSL:
++      try:
++        from twisted.internet import ssl
++        haveSSL=True
++      except ImportError:
++        haveSSL=False
++
++    if not haveSSL:
+         raise errors.NoSSLError()
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5bb9565..25848eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 10_preserve-umask.patch
 desktop-encoding-key.patch
 manpage-fixes.patch
+assert_ssl.patch

-- 
flumotion packaging



More information about the pkg-multimedia-commits mailing list