From d1943ad4643699a3defa1d4587192232a6bb06de Mon Sep 17 00:00:00 2001 From: Roger Ignazio Date: Mon, 12 May 2014 17:27:22 -0700 Subject: [PATCH] only install curl if it isn't defined elsewhere If ensure_package() is used with a conventional resource declaration such as `package { 'curl': ensure => present, }`, it could result in a duplicate resource error. This commit ensures that curl is not declared if it's already defined elsewhere, such as a site-wide packages class. --- manifests/system.pp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/manifests/system.pp b/manifests/system.pp index 9a65da86..2178a0ad 100644 --- a/manifests/system.pp +++ b/manifests/system.pp @@ -9,12 +9,14 @@ } # curl needs to be installed - case $::kernel { - Linux: { - ensure_packages(['curl']) - Package['curl'] -> Exec['system-rvm'] + if ! defined(Package['curl']) { + case $::kernel { + Linux: { + ensure_packages(['curl']) + Package['curl'] -> Exec['system-rvm'] + } + default: {} } - default: {} } exec { 'system-rvm':