summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Shubin <james@shubin.ca>2014-05-15 15:47:43 -0400
committerJames Shubin <james@shubin.ca>2014-05-16 14:00:57 -0400
commitbbecfb717885ff9ee6eec7f3cfc10fe73688310d (patch)
tree5398dbd49d9e851efb3db6796b7d883338280774
parent84150a0f009bf0f4ec894e31c02407c42a92854b (diff)
downloadpuppet-gluster-bbecfb717885ff9ee6eec7f3cfc10fe73688310d.tar.gz
puppet-gluster-bbecfb717885ff9ee6eec7f3cfc10fe73688310d.tar.xz
puppet-gluster-bbecfb717885ff9ee6eec7f3cfc10fe73688310d.zip
Silence stderr from 'which' when gluster is not installed yet.
-rw-r--r--lib/facter/gluster_ports.rb2
-rw-r--r--lib/facter/gluster_version.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/facter/gluster_ports.rb b/lib/facter/gluster_ports.rb
index 1de1c83..209538a 100644
--- a/lib/facter/gluster_ports.rb
+++ b/lib/facter/gluster_ports.rb
@@ -20,7 +20,7 @@ require 'facter'
# get the gluster path. this fact comes from an external fact set in: params.pp
gluster = Facter.value('gluster_program_gluster').to_s.chomp
if gluster == ''
- gluster = `which gluster`.chomp
+ gluster = `which gluster 2> /dev/null`.chomp
if gluster == ''
gluster = '/usr/sbin/gluster'
end
diff --git a/lib/facter/gluster_version.rb b/lib/facter/gluster_version.rb
index bb74fc8..ee14de5 100644
--- a/lib/facter/gluster_version.rb
+++ b/lib/facter/gluster_version.rb
@@ -20,7 +20,7 @@ require 'facter'
# get the gluster path. this fact comes from an external fact set in: params.pp
gluster = Facter.value('gluster_program_gluster').to_s.chomp
if gluster == ''
- gluster = `which gluster`.chomp
+ gluster = `which gluster 2> /dev/null`.chomp
if gluster == ''
gluster = '/usr/sbin/gluster'
end