X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fhas_role.rb;h=ecb3cabc6935d5c6612b3ee1a245578891ea8a9c;hb=2e2a6a3b1a42ca3351676096fdaa9f642894cdc8;hp=4527e34f862f5197de53fd894a5f308b420d1500;hpb=9eeae2f9a80286c29e3772f6df8f09a7f76d36b1;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..ecb3cabc 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
       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