diff options
| author | crayfishx <craig@craigdunn.org> | 2012-07-11 11:51:39 -0700 |
|---|---|---|
| committer | crayfishx <craig@craigdunn.org> | 2012-07-11 11:51:39 -0700 |
| commit | a60b40eb9f2e612f913aa14087632eac088f6e50 (patch) | |
| tree | 95c7a0ca73116abbde9b1ccc006ae47b34d3ee7c | |
| parent | b5fce3cce34c5ff01243a4dfe9205d26f3c98857 (diff) | |
| download | puppet-tftp-a60b40eb9f2e612f913aa14087632eac088f6e50.tar.gz puppet-tftp-a60b40eb9f2e612f913aa14087632eac088f6e50.tar.bz2 | |
Revert "Fully qualify $::caller_module_name fact."
* the problem is with the test not the code
This reverts commit b5fce3cce34c5ff01243a4dfe9205d26f3c98857.
| -rw-r--r-- | manifests/file.pp | 4 | ||||
| -rw-r--r-- | spec/fixtures/manifests/site.pp | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/file.pp b/manifests/file.pp index 6eaa394..3628188 100644 --- a/manifests/file.pp +++ b/manifests/file.pp @@ -44,8 +44,8 @@ define tftp::file ( if $source { $source_real = $source } elsif $ensure != 'directory' and ! $content { - if $::caller_module_name { - $mod = $::caller_module_name + if $caller_module_name { + $mod = $caller_module_name } else { $mod = $module_name } diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/spec/fixtures/manifests/site.pp |