diff options
| author | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-09 14:52:08 -0700 |
|---|---|---|
| committer | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-09 14:52:08 -0700 |
| commit | cdd45298337df80aad757e81eb7457317219c1b7 (patch) | |
| tree | 4132ab281a3064b892c4a59ffc99a2a2645a1bbd /lib/puppet/parser | |
| parent | c101da0b83210fe4c1603f3d7a014f72c988f5ac (diff) | |
| parent | 424b56da616041e365cb471dafc05a3d7ade4e45 (diff) | |
Merge branch '2.3.x' into 2.4.x
* 2.3.x:
Make sure functions are loaded for each test
Use rvalue functions correctly
(Maint) Don't mock with mocha
(Maint) Fix up the get_module_path parser function
(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)
(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
(Maint) Fix interpreter lines
Update CHANGELOG, Modulefile for 2.3.3
fix regression in #11017 properly
Fix spec tests using the new spec_helper
Update CHANGELOG for 2.3.2 release
Make file_line default to ensure => present
Memoize file_line spec instance variables
Fix spec tests using the new spec_helper
Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x"
(#13595) initialize_everything_for_tests couples modules Puppet ver
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/functions/get_module_path.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/get_module_path.rb b/lib/puppet/parser/functions/get_module_path.rb index 4d2b50b..1421b91 100644 --- a/lib/puppet/parser/functions/get_module_path.rb +++ b/lib/puppet/parser/functions/get_module_path.rb @@ -7,7 +7,7 @@ module Puppet::Parser::Functions $module_path = get_module_path('stdlib') EOT ) do |args| - raise(Puppet::ParseError, "get_module_name(): Wrong number of arguments, expects one") unless args.size == 1 + raise(Puppet::ParseError, "get_module_path(): Wrong number of arguments, expects one") unless args.size == 1 if module_path = Puppet::Module.find(args[0], compiler.environment.to_s) module_path.path else |