]> gitweb.fluxo.info Git - puppet-tftp.git/commitdiff
Fully qualify $::caller_module_name fact.
authorcrayfishx <craig@craigdunn.org>
Wed, 11 Jul 2012 17:51:18 +0000 (10:51 -0700)
committercrayfishx <craig@craigdunn.org>
Wed, 11 Jul 2012 17:51:18 +0000 (10:51 -0700)
This fixes the following failed test:

  1) tftp::file when deploying file from another module
     Failure/Error: })
       expected that the catalogue would contain File[/srv/tftp/sample] with source set to `"puppet:///modules/acme/sample"` but it is set to `"puppet:///modules/tftp/sample"` in the catalogue
     # ./spec/defines/tftp_file_spec.rb:138

manifests/file.pp
spec/fixtures/manifests/site.pp [deleted file]

index 3628188fca0097c02e323793c2c6da0c4451f629..6eaa394f620f8a57f73a73fb00fbb794ef66f172 100644 (file)
@@ -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
deleted file mode 100644 (file)
index e69de29..0000000