diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-14 18:11:53 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-14 18:11:53 +0000 |
| commit | bf5d0bc3cd4fd688aae2c0b1b93c32ddcbf3983c (patch) | |
| tree | 712ac9b7b153a2b6c198af18e3501982ae24b587 /bin/puppetrun | |
| parent | 64eb1e8c37bfc4b35814f3aa58dd497b4bb3d8b7 (diff) | |
| download | puppet-bf5d0bc3cd4fd688aae2c0b1b93c32ddcbf3983c.tar.gz puppet-bf5d0bc3cd4fd688aae2c0b1b93c32ddcbf3983c.tar.xz puppet-bf5d0bc3cd4fd688aae2c0b1b93c32ddcbf3983c.zip | |
Catching all errors encountered during loading, not just LoadError, to fix ongoing problems with rdoc/usage.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1593 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin/puppetrun')
| -rwxr-xr-x | bin/puppetrun | 4 |
1 files changed, 2 insertions, 2 deletions
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 |