[Python-modules-commits] r15914 - in packages/python-tornado/trunk/debian (4 files)

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

    Date: Tuesday, March 1, 2011 @ 00:54:07
  Author: chaica-guest
Revision: 15914

  * Added patch to look for ca-certificates.crt at the right place

Added:
  packages/python-tornado/trunk/debian/patches/certs-path.patch
Modified:
  packages/python-tornado/trunk/debian/changelog
  packages/python-tornado/trunk/debian/patches/series
Deleted:
  packages/python-tornado/trunk/debian/links

Modified: packages/python-tornado/trunk/debian/changelog
===================================================================
--- packages/python-tornado/trunk/debian/changelog	2011-02-28 19:36:13 UTC (rev 15913)
+++ packages/python-tornado/trunk/debian/changelog	2011-03-01 00:54:07 UTC (rev 15914)
@@ -3,7 +3,7 @@
   * New upstream release.
   * Added debian/examples
   * Added patch to ignore ca-certificates.crt from sources
-  * Added debian/links for ca-certificates.crt
+  * Added patch to look for ca-certificates.crt at the right place
   * debian/copyright
     - Added copyrights and license for some files
     - some files no more in the upstream sources
@@ -18,7 +18,7 @@
   * debian/watch
     - fixed the path
 
- -- Carl Chenet <chaica at ohmytux.com>  Fri, 25 Feb 2011 03:08:07 +0100
+ -- Carl Chenet <chaica at ohmytux.com>  Tue, 01 Mar 2011 02:38:06 +0100
 
 python-tornado (1.0.1-1) unstable; urgency=low
 

Deleted: packages/python-tornado/trunk/debian/links
===================================================================
--- packages/python-tornado/trunk/debian/links	2011-02-28 19:36:13 UTC (rev 15913)
+++ packages/python-tornado/trunk/debian/links	2011-03-01 00:54:07 UTC (rev 15914)
@@ -1 +0,0 @@
-/etc/ssl/certs/ca-certificates.crt /usr/share/pyshared/tornado/ca-certificates.crt

Added: packages/python-tornado/trunk/debian/patches/certs-path.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/certs-path.patch	                        (rev 0)
+++ packages/python-tornado/trunk/debian/patches/certs-path.patch	2011-03-01 00:54:07 UTC (rev 15914)
@@ -0,0 +1,19 @@
+Description: Looks for ca-certificates.crt at the good Debian location before trying local path
+Author: Carl Chenet <chaica at ohmytux.com>
+
+Index: facebook-tornado-778ed51/tornado/simple_httpclient.py
+===================================================================
+--- facebook-tornado-778ed51.orig/tornado/simple_httpclient.py	2011-03-01 02:03:24.000000000 +0100
++++ facebook-tornado-778ed51/tornado/simple_httpclient.py	2011-03-01 02:05:34.000000000 +0100
+@@ -27,7 +27,10 @@
+ except ImportError:
+     ssl = None
+ 
+-_DEFAULT_CA_CERTS = os.path.dirname(__file__) + '/ca-certificates.crt'
++if os.path.exists('/etc/ssl/certs/ca-certificates.crt'):
++    _DEFAULT_CA_CERTS = '/etc/ssl/certs/ca-certificates.crt'
++else:
++    _DEFAULT_CA_CERTS = os.path.dirname(__file__) + '/ca-certificates.crt'
+ 
+ class SimpleAsyncHTTPClient(object):
+     """Non-blocking HTTP client with no external dependencies.

Modified: packages/python-tornado/trunk/debian/patches/series
===================================================================
--- packages/python-tornado/trunk/debian/patches/series	2011-02-28 19:36:13 UTC (rev 15913)
+++ packages/python-tornado/trunk/debian/patches/series	2011-03-01 00:54:07 UTC (rev 15914)
@@ -1 +1,2 @@
 ignore-ca-certificates.patch
+certs-path.patch