summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2017-11-05 02:46:59 -0500
committerJesse Luehrs <doy@tozt.net>2017-11-05 02:46:59 -0500
commit0ad593583ec7d40f956790fcf9ae8531f5783985 (patch)
treee98489199540b68b687d5f4234afb92bf9fbe9d1
parent457182147fefb19dd7f3feda99dcd9f7acaa8a51 (diff)
downloadpuppet-tozt-0ad593583ec7d40f956790fcf9ae8531f5783985.tar.gz
puppet-tozt-0ad593583ec7d40f956790fcf9ae8531f5783985.zip
apparently join isn't a thing
-rw-r--r--modules/package/manifests/makepkg.pp9
-rw-r--r--modules/tozt/manifests/other_packages.pp2
2 files changed, 8 insertions, 3 deletions
diff --git a/modules/package/manifests/makepkg.pp b/modules/package/manifests/makepkg.pp
index 587a9fd..7fecdb4 100644
--- a/modules/package/manifests/makepkg.pp
+++ b/modules/package/manifests/makepkg.pp
@@ -1,5 +1,10 @@
-define package::makepkg($extra_options=[]) {
- $extra_cmdline = join($extra_options, ' ')
+define package::makepkg($asdeps=false) {
+ if $asdeps {
+ $extra_cmdline = " --asdeps"
+ }
+ else {
+ $extra_cmdline = ""
+ }
exec { "install $name":
command => "
diff --git a/modules/tozt/manifests/other_packages.pp b/modules/tozt/manifests/other_packages.pp
index 907b7db..3673fed 100644
--- a/modules/tozt/manifests/other_packages.pp
+++ b/modules/tozt/manifests/other_packages.pp
@@ -28,7 +28,7 @@ class tozt::other_packages {
}
package::makepkg { 'package-query':
- extra_options => ["--asdeps"],
+ asdeps => true,
require => Package['yajl'];
}