From fa7e505e67afc191cba896dcbfce7e7e57683f17 Mon Sep 17 00:00:00 2001
From: Ryan Kennedy <rkennedy@2ndwatch.com>
Date: Mon, 21 Dec 2015 12:17:17 -0800
Subject: [PATCH] added conditionals around package installs so it doesnt bomb
 on catalog compile if package is already defined in another module

---
 manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 56c17d28..07bcdf03 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -266,13 +266,13 @@
     }
   }
 
-  if $manage_git {
+  if $manage_git and !defined(Package['git']) {
     package {'git':
       ensure => installed,
     }
   }
 
-  if $manage_virtualenv {
+  if $manage_virtualenv and !defined(Package[$::puppetboard::params::virtualenv]) {
     package { $::puppetboard::params::virtualenv:
       ensure => installed,
     }