diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-02-15 21:56:54 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-02-15 21:56:54 +0000 |
| commit | 037b7acab071adc727fbed8cfc3cea1c0399c2e2 (patch) | |
| tree | a659e17c133ddb93664a67dc16bad9d257bf66ce /lib/puppet/parser | |
| parent | 6fe01cedeb2fe00df62bf63d7f7375d18d0663ca (diff) | |
| download | puppet-037b7acab071adc727fbed8cfc3cea1c0399c2e2.tar.gz puppet-037b7acab071adc727fbed8cfc3cea1c0399c2e2.tar.xz puppet-037b7acab071adc727fbed8cfc3cea1c0399c2e2.zip | |
Changed the parsedtype definition of exists(), and fixed a few smaller bugs. Last code commit before 0.13.2
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@915 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/interpreter.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index ce6a9935c..1ad039f06 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -83,7 +83,11 @@ module Puppet # Connect to the LDAP Server def setup_ldap - require 'ldap' + begin + require 'ldap' + rescue LoadError + @ldap = nil + end begin @ldap = LDAP::Conn.new(Puppet[:ldapserver], Puppet[:ldapport]) @ldap.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3) |