diff options
| author | James Turnbull <james@lovedthanlost.net> | 2009-12-13 08:41:11 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-12-18 14:35:08 +1100 |
| commit | f5960ce2bde4af9af1af8bdf106e83d21afacb5c (patch) | |
| tree | 2c5e92b97e90e8f81f6f8ab7a266c7e09c1351ba /lib/puppet/application/puppetrun.rb | |
| parent | 2d88926b76e14c8aa105ad7b1480cee9132fc699 (diff) | |
| download | puppet-f5960ce2bde4af9af1af8bdf106e83d21afacb5c.tar.gz puppet-f5960ce2bde4af9af1af8bdf106e83d21afacb5c.tar.xz puppet-f5960ce2bde4af9af1af8bdf106e83d21afacb5c.zip | |
Closed #2937 - Migrated a number of requires to features
Diffstat (limited to 'lib/puppet/application/puppetrun.rb')
| -rw-r--r-- | lib/puppet/application/puppetrun.rb | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/puppet/application/puppetrun.rb b/lib/puppet/application/puppetrun.rb index 2dbd803fa..41ebf9f1a 100644 --- a/lib/puppet/application/puppetrun.rb +++ b/lib/puppet/application/puppetrun.rb @@ -1,18 +1,9 @@ -begin - require 'rubygems' -rescue LoadError - # Nothing; we were just doing this just in case -end - -begin - require 'ldap' -rescue LoadError - $stderr.puts "Failed to load ruby LDAP library. LDAP functionality will not be available" -end - require 'puppet' require 'puppet/application' +Puppet.warning "RubyGems not installed" unless Puppet.features.rubygems? +Puppet.warning "Failed to load ruby LDAP library. LDAP functionality will not be available" unless Puppet.features.ldap? + Puppet::Application.new(:puppetrun) do should_not_parse_config |