diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-08-25 20:00:21 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-08-25 20:00:21 +0000 |
| commit | b612a15f9585a4922e7bc928bf534180396bc22d (patch) | |
| tree | c3e3b98f45f3a4d91f24c5b9c3d6af6716780c77 /lib/puppet/autoload.rb | |
| parent | 8fcec23c16eb3698a2549c9b668f0e40ad84d082 (diff) | |
| download | puppet-b612a15f9585a4922e7bc928bf534180396bc22d.tar.gz puppet-b612a15f9585a4922e7bc928bf534180396bc22d.tar.xz puppet-b612a15f9585a4922e7bc928bf534180396bc22d.zip | |
Try this; seems to work for machines with both ActiveSupport installed and not. MissingSourceFile is an AS thing, though it subclasses LoadError.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1487 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/autoload.rb')
| -rw-r--r-- | lib/puppet/autoload.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/puppet/autoload.rb b/lib/puppet/autoload.rb index 4e5d07e31..0a2b7b6b5 100644 --- a/lib/puppet/autoload.rb +++ b/lib/puppet/autoload.rb @@ -1,8 +1,3 @@ -# I have no idea what's going on here, but... -unless defined? MissingSourceFile - class MissingSourceFile < RuntimeError - end -end # Autoload paths, either based on names or all at once. class Puppet::Autoload include Puppet::Util @@ -54,8 +49,6 @@ class Puppet::Autoload Kernel.load path, @wrap @loaded[name] = true return true - rescue MissingSourceFile - return false rescue LoadError => detail # I have no idea what's going on here, but different versions # of ruby are raising different errors on missing files. |