Merge pull request blt04#39 from rji/fix-curl-resource

only install curl if it isn't defined elsewhere
togga · May 13, 2014 · 5a4ef08 · 5a4ef08
2 parents 478d842 + d1943ad
commit 5a4ef08
Showing 1 changed file with 7 additions and 5 deletions.
diff --git 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':