fixes

diff --git a/manifests/site.pp b/manifests/site.pp
index 7de155a929c4df46b61e9bff39c9f882216cae9e..e0f2ef4500b018458bea051028ca3352462ea85c 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -122,7 +122,7 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case getfromhash($hosterinfo, "name") {
+    case getfromhash($hosterinfo, 'name') {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
     case $portforwarder_user_exists {

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
index 022ca895af991943211fefb06c4dc166f31b8ee1..1615c3b86937ca7011da7953f0c33d280527066a 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@ -9,7 +9,7 @@ module Puppet::Parser::Functions
 
     $KCODE = 'utf-8'
 
-    ans = {"name": "unknown"}
+    ans = {"name" => "unknown"}
     yaml = YAML.load_file(yamlfile)
 
     if (nodeinfo['ldap'].has_key?('ipHostNumber'))
@@ -27,7 +27,7 @@ module Puppet::Parser::Functions
                 ans = yaml[hoster]
                 ans['name'] = hoster
               end
-            rescue Exception => e
+            rescue => e
               raise "Error while trying to match addr #{addr} for net #{net}: #{e.message}\n#{e.backtrace}"
             end
           end