summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>2006-09-14 16:45:39 +0000
committerlutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>2006-09-14 16:45:39 +0000
commit5e2091b1ee3a7ddb601af43254de51b7e0bd24a2 (patch)
tree3a5457ea42f2a4e86509ee85cd04c87a62ac9297
parent37c9633f115013f718e561823e4a05880dfd599e (diff)
downloadpuppet-5e2091b1ee3a7ddb601af43254de51b7e0bd24a2.tar.gz
puppet-5e2091b1ee3a7ddb601af43254de51b7e0bd24a2.tar.xz
puppet-5e2091b1ee3a7ddb601af43254de51b7e0bd24a2.zip
Brute force fix for trac #266
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1591 980ebf18-57e1-0310-9a29-db15c13687c0
-rwxr-xr-xbin/puppetrun6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/puppetrun b/bin/puppetrun
index 0857f60f7..c48b5bf08 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -119,7 +119,11 @@
exit(1)
end
end
-require 'ldap'
+begin
+ require 'ldap'
+rescue LoadError
+ $stderr.puts "Failed to load ruby LDAP library. LDAP functionality will not be available"
+end
require 'puppet'
require 'puppet/server'
require 'puppet/client'