tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

puppet: Second attempt at fixing puppet-check's rubygems dependency

Browse source
This commit is contained in:
Ossi Salmi 2014-04-07 16:14:36 +03:00
parent 8e8baaa349
commit 2f5656ca68
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
puppet/files/puppet-check
View file

@ -1,15 +1,16 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
if not defined? ::Bundler
begin
require 'rubygems'
rescue LoadError
end
end
require "puppet"
require "syslog" require "syslog"
require "socket" require "socket"
begin
require "puppet"
rescue LoadError
require "rubygems"
require "puppet"
end
Syslog.open(File.basename(__FILE__), Syslog::LOG_PID | Syslog::LOG_NDELAY, Syslog.open(File.basename(__FILE__), Syslog::LOG_PID | Syslog::LOG_NDELAY,
Syslog::LOG_DAEMON) Syslog::LOG_DAEMON)
@ -75,4 +76,3 @@ Syslog.warning err
system("service --help > /dev/null 2>&1 && service puppet start > /dev/null") system("service --help > /dev/null 2>&1 && service puppet start > /dev/null")
system(puppetd) if $?.exitstatus == 127 system(puppetd) if $?.exitstatus == 127
Syslog.close Syslog.close