summaryrefslogtreecommitdiffstats
path: root/bin/puppetmasterd
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-09-14 18:11:53 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-09-14 18:11:53 +0000
commitbf5d0bc3cd4fd688aae2c0b1b93c32ddcbf3983c (patch)
tree712ac9b7b153a2b6c198af18e3501982ae24b587 /bin/puppetmasterd
parent64eb1e8c37bfc4b35814f3aa58dd497b4bb3d8b7 (diff)
downloadpuppet-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/puppetmasterd')
-rwxr-xr-xbin/puppetmasterd2
1 files changed, 1 insertions, 1 deletions
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