diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-08-09 13:58:33 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-08-09 13:58:33 -0700 |
| commit | 6d1418ca7069816353356db960fbeee623451856 (patch) | |
| tree | d848d7233aee548cc9313a3de5e07bc00e585e12 | |
| parent | 2db9725bf6774de2e1fe9d42f4b1de948524acd3 (diff) | |
| parent | 746a374f6ffe9be0628d720b0e4759bde7caf8db (diff) | |
| download | puppet-6d1418ca7069816353356db960fbeee623451856.tar.gz puppet-6d1418ca7069816353356db960fbeee623451856.tar.xz puppet-6d1418ca7069816353356db960fbeee623451856.zip | |
Merge branch 'ticket/2.7.x/maint-fix_inspect_help' into 2.7.x
* ticket/2.7.x/maint-fix_inspect_help:
maint: Fix case sensitive require
| -rw-r--r-- | lib/puppet/application.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/application_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb index 1e00bcce7..b7cb1169d 100644 --- a/lib/puppet/application.rb +++ b/lib/puppet/application.rb @@ -216,7 +216,7 @@ class Application klass = name.to_s.capitalize begin - require File.join('puppet', 'application', name.to_s) + require File.join('puppet', 'application', name.to_s.downcase) rescue LoadError => e puts "Unable to find application '#{name}'. #{e}" Kernel::exit(1) diff --git a/spec/unit/application_spec.rb b/spec/unit/application_spec.rb index b56aa20b0..fd93ceb00 100755 --- a/spec/unit/application_spec.rb +++ b/spec/unit/application_spec.rb @@ -32,7 +32,7 @@ describe Puppet::Application do it "should exit if it can't find a class" do reg = "Unable to find application 'ThisShallNeverEverEverExist'. " - reg += "no such file to load -- puppet/application/ThisShallNeverEverEverExist" + reg += "no such file to load -- puppet/application/thisshallneverevereverexist" @klass.expects(:puts).with(reg) expect { @klass.find("ThisShallNeverEverEverExist") }.to exit_with 1 |