From 579330f9b92b5bff4d9ebb81821e2ff9baebfa8fc7109506b99e7e3c53e0ff16 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 3 Jul 2013 08:23:39 +0000 Subject: [PATCH] - Drop SLES parts of ca_certs_locater.py, it's meant for openSUSE only OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-httplib2?expand=0&rev=39 --- ca_certs_locater.py | 13 ++----------- python-httplib2.changes | 5 +++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ca_certs_locater.py b/ca_certs_locater.py index 721f6df..57a3a0d 100644 --- a/ca_certs_locater.py +++ b/ca_certs_locater.py @@ -1,21 +1,12 @@ # -# httplib2 system SSL certificate bundle locator for openSUSE / SLES. -# openSUSE has /etc/ssl/ca-bundle.pem (from package ca-certificates) but on -# SLES, it's only individual files (from openssl-certs) +# httplib2 system SSL certificate bundle locator for openSUSE. # # Author: Sascha Peilicke # def get(): - for line in open("/etc/SuSE-release"): - if "SUSE Linux Enterprise Server" in line: - # Python-2.x doesn't support loading from a directory containing - # PEM files, thus we have to use a bundle created by hand (and - # refreshed with updates of either httpli2 or openssl-certs). - return "ca-bundle.pem" - else: - return "/etc/ssl/ca-bundle.pem" + return "/etc/ssl/ca-bundle.pem" if __name__ == "__main__": diff --git a/python-httplib2.changes b/python-httplib2.changes index 1e46190..753a338 100644 --- a/python-httplib2.changes +++ b/python-httplib2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 3 08:26:46 UTC 2013 - speilicke@suse.com + +- Drop SLES parts of ca_certs_locater.py, it's meant for openSUSE only + ------------------------------------------------------------------- Thu Jun 20 11:48:15 UTC 2013 - speilicke@suse.com