diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-06-17 19:37:23 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-06-17 19:37:23 +1000 |
| commit | 463aab8d55cd7d1ba9abd941e82cb2d4483d0e52 (patch) | |
| tree | 78d3c0623734730f7d6c6badd86ea23f8b5d6885 /lib/puppet | |
| parent | 0f501e327dc767bb09d92429693f51629782065a (diff) | |
| parent | 2380fcd4d187e8592398015e96605ce4b5d63e7d (diff) | |
| download | puppet-463aab8d55cd7d1ba9abd941e82cb2d4483d0e52.tar.gz puppet-463aab8d55cd7d1ba9abd941e82cb2d4483d0e52.tar.xz puppet-463aab8d55cd7d1ba9abd941e82cb2d4483d0e52.zip | |
Merge branch 'tickets/0.24.x/1012' of git://github.com/lak/puppet into 0.24.x
Conflicts:
CHANGELOG
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/module.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb index b86931664..544d94ea9 100644 --- a/lib/puppet/module.rb +++ b/lib/puppet/module.rb @@ -63,6 +63,10 @@ class Puppet::Module return template end + # If we can find the template in :templatedir, we return that. + td_file = File.join(Puppet.settings.value(:templatedir, environment), template) + return td_file if File.exists?(td_file) + path, file = split_path(template) # Because templates don't have an assumed template name, like manifests do, @@ -76,7 +80,7 @@ class Puppet::Module if mod return mod.template(file) else - return File.join(Puppet.settings.value(:templatedir, environment), template) + return td_file # Return this anyway, since we're going to fail. end end |