From b8563e31100bc5026702edbdc4eaf4325adfc306 Mon Sep 17 00:00:00 2001 From: maxgalbu Date: Sun, 29 Sep 2013 13:56:06 +0200 Subject: [PATCH 1/2] libyaml is available only on centos 5 --- manifests/dependencies/centos.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/manifests/dependencies/centos.pp b/manifests/dependencies/centos.pp index 2a3d61f4..6e8ba6fd 100644 --- a/manifests/dependencies/centos.pp +++ b/manifests/dependencies/centos.pp @@ -11,6 +11,12 @@ if ! defined(Package['curl-devel']) { package { 'curl-devel': ensure => present } } } } + case $::operatingsystemrelease { + /^5\..*/: { + if ! defined(Package['libyaml-devel']) { package { 'libyaml-devel': ensure => present } } + } + } + if ! defined(Package['which']) { package { 'which': ensure => present } } if ! defined(Package['gcc']) { package { 'gcc': ensure => present } } if ! defined(Package['gcc-c++']) { package { 'gcc-c++': ensure => present } } @@ -31,7 +37,6 @@ if ! defined(Package['readline-devel']) { package { 'readline-devel': ensure => present } } if ! defined(Package['patch']) { package { 'patch': ensure => present } } if ! defined(Package['git']) { package { 'git': ensure => present } } - if ! defined(Package['libyaml-devel']) { package { 'libyaml-devel': ensure => present } } if ! defined(Package['libffi-devel']) { package { 'libffi-devel': ensure => present } } if ! defined(Package['libtool']) { package { 'libtool': ensure => present } } if ! defined(Package['bison']) { package { 'bison': ensure => present } } From 1398fe5c34521cae8dde0d518710e71f45f76b69 Mon Sep 17 00:00:00 2001 From: maxgalbu Date: Wed, 2 Oct 2013 09:58:55 +0200 Subject: [PATCH 2/2] don't create another case for nothing --- manifests/dependencies/centos.pp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/manifests/dependencies/centos.pp b/manifests/dependencies/centos.pp index 6e8ba6fd..9b0e9b70 100644 --- a/manifests/dependencies/centos.pp +++ b/manifests/dependencies/centos.pp @@ -6,16 +6,12 @@ } /^5\..*/: { if ! defined(Package['autoconf']) { package { 'autoconf': ensure => present } } + if ! defined(Package['libyaml-devel']) { package { 'libyaml-devel': ensure => present } } } default: { if ! defined(Package['curl-devel']) { package { 'curl-devel': ensure => present } } } } - case $::operatingsystemrelease { - /^5\..*/: { - if ! defined(Package['libyaml-devel']) { package { 'libyaml-devel': ensure => present } } - } - } if ! defined(Package['which']) { package { 'which': ensure => present } } if ! defined(Package['gcc']) { package { 'gcc': ensure => present } }