From 66fb703e79d09523a4e468f5f01e1bb78a79437b Mon Sep 17 00:00:00 2001
From: Aimon Bustardo <abustardo@morphlabs.com>
Date: Tue, 6 Nov 2012 15:13:47 -0800
Subject: [PATCH] wrap utilities packages in a if \!defined to prevent conflict
 with rvm module

---
 manifests/utilities.pp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/manifests/utilities.pp b/manifests/utilities.pp
index 782c35998..80582224a 100644
--- a/manifests/utilities.pp
+++ b/manifests/utilities.pp
@@ -1,8 +1,14 @@
 # unzip swig screen parted curl euca2ools - extra packages
 class nova::utilities {
-  if $::osfamily == 'Debian' {
-    package { ['unzip', 'screen', 'parted', 'curl', 'euca2ools']:
-      ensure => present
+  define nova::utilities::install(){
+    if !defined(Package[$title]){
+      package { $title:
+        ensure => present
+      }
     }
   }
+  if $::osfamily == 'Debian' {
+    $pkgs=['unzip', 'screen', 'parted', 'curl', 'euca2ools']
+    nova::utilities::install{$pkgs:}
+  }
 }