X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fhas_role.rb;h=c8b537f796ea85c62d7603b6cc76653db38605e4;hb=d32b5ca2040af0e861851c5519aa5ff5b7887768;hp=4527e34f862f5197de53fd894a5f308b420d1500;hpb=fe66c99f833e7e596458ea7d5539aacf1904f4c1;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 4527e34f..c8b537f7 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
@@ -1,14 +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
+        return false
       end
       return roles[role].include?(fqdn)
     end
-  end
 end