Include is enough, and fail if parameter/class not found

camptocamp · Sep 1, 2016 · b985f37 · b985f37
1 parent 88fb2cf
commit b985f37
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/manifests/extract.pp b/manifests/extract.pp
@@ -44,14 +44,18 @@
   $tar_command=undef,
 ) {
 
-  require ::archive::params
+  include ::archive::params
 
   if $root_dir {
     $extract_dir = "${target}/${root_dir}"
   } else {
     $extract_dir = "${target}/${name}"
   }
 
+  if ! $tar_command and ! $::archive::params::tarcmd {
+    fail("${module_name}: parameter \$tar_command not specified and \$::archive::params::tarcmd not found")
+  }
+
   if $tar_command {
     $real_tar_command = $tar_command
   } else {

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -54,8 +54,6 @@
 ) {
 
   include ::archive::params
-  Class['archive::params'] ->
-  Archive[$name]
 
   archive::download {"${name}.${extension}":
     ensure           => $ensure,