aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2014-10-08 17:50:19 +0000
committerDaniele Tricoli <eriol@mornie.org>2014-10-08 17:50:19 +0000
commit00706dce34a64a1ff3e6f4dcdaba94ab43062b89 (patch)
tree6cff46d294f4d286e085e6fb5a84327cb48797b6 /debian/patches
parente81af4ad239268f244c0aecde47fba79feda4964 (diff)
downloadpython-requests-00706dce34a64a1ff3e6f4dcdaba94ab43062b89.tar
python-requests-00706dce34a64a1ff3e6f4dcdaba94ab43062b89.tar.gz
Refresh 01_use-system-ca-certificates.patch
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/01_use-system-ca-certificates.patch18
1 files changed, 10 insertions, 8 deletions
diff --git a/debian/patches/01_use-system-ca-certificates.patch b/debian/patches/01_use-system-ca-certificates.patch
index 6f18dcb..258455e 100644
--- a/debian/patches/01_use-system-ca-certificates.patch
+++ b/debian/patches/01_use-system-ca-certificates.patch
@@ -2,22 +2,24 @@ Description: Use the bundle provided by ca-certificates instead of
the embedded one.
Author: Daniele Tricoli <eriol@mornie.org>
Forwarded: not-needed
-Last-Update: 2013-01-19
+Last-Update: 2014-10-08
--- a/requests/certs.py
+++ b/requests/certs.py
-@@ -18,7 +18,7 @@
- def where():
- """Return the preferred certificate bundle."""
- # vendored bundle inside Requests
-- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
-+ return '/etc/ssl/certs/ca-certificates.crt'
+@@ -18,8 +18,8 @@
+ except ImportError:
+ def where():
+ """Return the preferred certificate bundle."""
+- # vendored bundle inside Requests
+- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
++ # On Debian systems use ca-certificates
++ return '/etc/ssl/certs/ca-certificates.crt'
if __name__ == '__main__':
print(where())
--- a/setup.py
+++ b/setup.py
-@@ -41,7 +41,7 @@
+@@ -43,7 +43,7 @@
author_email='me@kennethreitz.com',
url='http://python-requests.org',
packages=packages,