From: Bastian Blank <waldi@debian.org>
Date: Tue, 11 Apr 2017 19:32:17 +0000 (+0200)
Subject: Ignore missing swede
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e41ff10108e9504ea508a311219840777572efdb;p=mirror%2Fdsa-puppet.git

Ignore missing swede
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb b/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb
index e2d0a6026..1e008e0a6 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb
@@ -22,7 +22,11 @@ module Puppet::Parser::Functions
       ports.each do |port|
         if File.exist?(certfile)
           cmd = ['swede', 'create', '--usage=3', '--selector=1', '--mtype=1', '--certificate', certfile, '--port', port.to_s, hostname]
-          IO.popen(cmd, "r") {|i| res << i.read }
+          begin
+            IO.popen(cmd, "r") {|i| res << i.read }
+          rescue Errno::ENOENT
+            res << "; Failed to find swede"
+          end
         else
           res << "; certfile #{certfile} did not exist to create TLSA record for #{hostname}:#{port}."
         end