X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fhas_role.rb;h=c8b537f796ea85c62d7603b6cc76653db38605e4;hb=4f61b8e70efe97667851c2db0034339a33ae1c06;hp=a8f9fd3a30d1d7ccaca9d39e49994aad09ab720f;hpb=a745f5b70e9beb021a0c1937a6500397b0a02435;p=dsa-puppet.git

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
index a8f9fd3a..c8b537f7 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
@@ -1,10 +1,12 @@
 module Puppet::Parser::Functions
   newfunction(:has_role, :type => :rvalue) do |args|
-    begin
-      role = args.shift
+      role = args[0]
       roles = lookupvar('site::roles')
       fqdn = lookupvar('fqdn')
+      if not roles.include?(role)
+        err "Failed to look up missing role #{role}"
+        return false
+      end
       return roles[role].include?(fqdn)
     end
-  end
 end