diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-06-15 14:05:10 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-06-15 14:05:10 +0000 |
| commit | b5523ff881224bd6f4eafcf9a489bbb6331d05c2 (patch) | |
| tree | 235a92bd30af5581ba65a2bbe2ded6698948efe0 | |
| parent | f84ac7d2705296f1dc0e419b5adfdfb4b008de2f (diff) | |
| download | puppet-b5523ff881224bd6f4eafcf9a489bbb6331d05c2.tar.gz puppet-b5523ff881224bd6f4eafcf9a489bbb6331d05c2.tar.xz puppet-b5523ff881224bd6f4eafcf9a489bbb6331d05c2.zip | |
Trying to load ruby gems, in case needed libraries are installed that way, and fixing a warning in the provider
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2588 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | lib/puppet.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/provider.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index 527061d9d..740ba1eb2 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -1,3 +1,9 @@ +# Try to load rubygems. Hey rubygems, I hate you. +begin + require 'rubygems' +rescue LoadError +end + # see the bottom of the file for further inclusions require 'singleton' require 'facter' diff --git a/lib/puppet/provider.rb b/lib/puppet/provider.rb index 612d8adc6..7ef0bdce9 100644 --- a/lib/puppet/provider.rb +++ b/lib/puppet/provider.rb @@ -16,7 +16,7 @@ class Puppet::Provider # The source parameter exists so that providers using the same # source can specify this, so reading doesn't attempt to read the # same package multiple times. - attr_accessor :source + attr_writer :source # LAK 2007-05-09: Keep the model stuff around for backward compatibility attr_reader :model |