diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 15:59:52 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 15:59:52 -0700 |
| commit | 243c7c2a499697654101af726f1f47d367e41c13 (patch) | |
| tree | 855d07f105866afbb26f5e093997a7d5f295e408 /lib/puppet | |
| parent | cc414a422de0d773a1012ca57f41f15b4d6caf06 (diff) | |
| parent | effdfb845092fbe549c286926ac686aab1746a12 (diff) | |
Merge branch '2.3.x'
* 2.3.x:
(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
Conflicts:
spec/spec_helper.rb
spec/unit/puppet/parser/functions/get_module_path_spec.rb
Diffstat (limited to 'lib/puppet')
| -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 |