From a60b40eb9f2e612f913aa14087632eac088f6e50 Mon Sep 17 00:00:00 2001 From: crayfishx Date: Wed, 11 Jul 2012 11:51:39 -0700 Subject: Revert "Fully qualify $::caller_module_name fact." * the problem is with the test not the code This reverts commit b5fce3cce34c5ff01243a4dfe9205d26f3c98857. --- manifests/file.pp | 4 ++-- spec/fixtures/manifests/site.pp | 0 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 spec/fixtures/manifests/site.pp 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 -- cgit v1.2.3