[checkmk-commits] Simplified conditional.

Module: check_mk Branch: master Commit: 27dc348d9c7122ee33eb36c81ef4fe72cc6dba48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27dc348d9c7122… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 26 09:10:50 2018 +0200 Simplified conditional. This way it is a bit clearer that we are actually doing a switch/case here. Change-Id: I716f1ead50db1ff93b1b32598884300887e488de --- omd/packages/python-modules/Makefile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index b16b89a..cb31b24 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -93,18 +93,16 @@ ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4 MODULES += cryptography-1.4.tar.gz PATCHES += patches/0005-NID_ecdsa_with_SHA-fix.patch PATCHES += patches/0009-cryptography-1.4-disable-version-warning.patch +else ifneq ($(filter $(DISTRO_CODE),el6),) +# Cryptography dropped support for OpenSSL 1.0.0 with release 1.7 +# (https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst), +# so we stick with 1.5.3. + MODULES += cryptography-1.5.3.tar.gz + PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch + PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch else - ifneq ($(filter $(DISTRO_CODE),el6),) - # Cryptography dropped support for OpenSSL 1.0.0 with release 1.7 - # (https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst). - # Therefore we need stick with 1.5.3 which was default previously to 1.9. - MODULES += cryptography-1.5.3.tar.gz - PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch - PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch - else - MODULES += cryptography-1.9.tar.gz - MODULES += asn1crypto-0.24.0.tar.gz - endif + MODULES += cryptography-1.9.tar.gz + MODULES += asn1crypto-0.24.0.tar.gz endif # Added for NetApp special agent, but may be used in other components too in future