From ab749e74149ee82cb903ed82dc8396657d1d5b83 Mon Sep 17 00:00:00 2001
From: Roman Barczyński <romke@estrefa.pl>
Date: Thu, 3 Mar 2011 04:08:32 +0100
Subject: no need for "#! ruby", vim modeline must end with ":", and fixed not
 found key bug

---
 load_vars.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/load_vars.rb b/load_vars.rb
index 0365cf9..07ee745 100644
--- a/load_vars.rb
+++ b/load_vars.rb
@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-#
 # load_vars.rb
 #
 # This script will allow for loading variables from an external YAML
@@ -59,11 +57,11 @@ module Puppet::Parser::Functions
       raise(Puppet::ParseError,
         "Data in the file `%s' is not a hash" % file) unless data.is_a?(Hash)
 
-      data = data[key] if key and data[key].is_a?(Hash)
+      data = ((data[key].is_a?(Hash)) ? data[key] : {}) if key
     end
 
     data.each { |param, value| setvar(param, strinterp(value)) }
   end
 end
 
-# vim: set ts=2 sw=2 et
+# vim: set ts=2 sw=2 et :
-- 
cgit v1.2.3