diff options
| -rwxr-xr-x | bin/puppet | 2 | ||||
| -rwxr-xr-x | bin/puppetca | 2 | ||||
| -rwxr-xr-x | bin/puppetd | 2 | ||||
| -rwxr-xr-x | bin/puppetdoc | 2 | ||||
| -rwxr-xr-x | bin/puppetmasterd | 2 | ||||
| -rwxr-xr-x | bin/puppetrun | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/bin/puppet b/bin/puppet index 4ad3d7441..ef78bd025 100755 --- a/bin/puppet +++ b/bin/puppet @@ -64,7 +64,7 @@ $haveusage = true begin require 'rdoc/usage' -rescue LoadError +rescue $haveusage = false end diff --git a/bin/puppetca b/bin/puppetca index d694ba294..11a75937b 100755 --- a/bin/puppetca +++ b/bin/puppetca @@ -84,7 +84,7 @@ $haveusage = true begin require 'rdoc/usage' -rescue LoadError +rescue $haveusage = false end diff --git a/bin/puppetd b/bin/puppetd index 63435860b..f4350ab59 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -155,7 +155,7 @@ require 'getoptlong' $haveusage = true begin require 'rdoc/usage' -rescue LoadError +rescue $haveusage = false end diff --git a/bin/puppetdoc b/bin/puppetdoc index 4ff8f1911..347bf1b32 100755 --- a/bin/puppetdoc +++ b/bin/puppetdoc @@ -48,7 +48,7 @@ $haveusage = true begin require 'rdoc/usage' -rescue LoadError +rescue $haveusage = false end diff --git a/bin/puppetmasterd b/bin/puppetmasterd index b88cf61f3..84456f371 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -105,7 +105,7 @@ $haveusage = true begin require 'rdoc/usage' -rescue LoadError +rescue $haveusage = false end diff --git a/bin/puppetrun b/bin/puppetrun index c48b5bf08..b73e2b813 100755 --- a/bin/puppetrun +++ b/bin/puppetrun @@ -121,7 +121,7 @@ end begin require 'ldap' -rescue LoadError +rescue $stderr.puts "Failed to load ruby LDAP library. LDAP functionality will not be available" end require 'puppet' @@ -174,7 +174,7 @@ $haveusage = true begin require 'rdoc/usage' -rescue LoadError +rescue $haveusage = false end |