From fa6dfdf6d59aa6e630ed1464496d614d284e0faa Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Tue, 18 Nov 2014 12:01:03 +0100 Subject: [PATCH] lib/facter: Encapsulate Facter setcode Avoid potential problems, and add setcode only if edploy command is present and executable. --- lib/facter/edeploy.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/facter/edeploy.rb b/lib/facter/edeploy.rb index 33985ab4..58ece7c4 100644 --- a/lib/facter/edeploy.rb +++ b/lib/facter/edeploy.rb @@ -17,18 +17,24 @@ # Facter.add('edeploy_role_version') do setcode do - Facter::Util::Resolution.exec('/usr/sbin/edeploy version') + if File.executable?('/usr/sbin/edeploy') + Facter::Util::Resolution.exec('/usr/sbin/edeploy version') + end end end Facter.add('edeploy_role_name') do setcode do - Facter::Util::Resolution.exec('/usr/sbin/edeploy role') + if File.executable?('/usr/sbin/edeploy') + Facter::Util::Resolution.exec('/usr/sbin/edeploy role') + end end end Facter.add('edeploy_profile') do setcode do - Facter::Util::Resolution.exec('/usr/sbin/edeploy profile') + if File.executable?('/usr/sbin/edeploy') + Facter::Util::Resolution.exec('/usr/sbin/edeploy profile') + end end end