summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR.I.Pienaar <rip@devco.net>2012-05-23 14:42:14 -0700
committerR.I.Pienaar <rip@devco.net>2012-05-23 14:42:14 -0700
commit1c0e725ba72f177f4317379c6f59107dfe615147 (patch)
treec2e40e1a81b9e1c4a8622b20a7c84cfb0b0191c7
parent52dbf4a61a0a47b82b5213def9fe19b7af47a498 (diff)
parent21d0d2abf2542aaf2f60c9028a8f6653351af0e1 (diff)
downloadpuppet-concat-1c0e725ba72f177f4317379c6f59107dfe615147.tar.gz
puppet-concat-1c0e725ba72f177f4317379c6f59107dfe615147.tar.bz2
Merge pull request #21 from mrwacky42/basedir_warning
Fail with helpful advice if $::concat_basedir is not yet set
-rw-r--r--manifests/setup.pp8
1 files changed, 7 insertions, 1 deletions
diff --git a/manifests/setup.pp b/manifests/setup.pp
index fb75584..38aeb96 100644
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -18,7 +18,13 @@ class concat::setup {
root => 0,
default => $id
}
- $concatdir = $::concat_basedir
+
+ if $::concat_basedir {
+ $concatdir = $::concat_basedir
+ } else {
+ fail ("\$concat_basedir not defined. Try running again with pluginsync enabled")
+ }
+
$majorversion = regsubst($::puppetversion, '^[0-9]+[.]([0-9]+)[.][0-9]+$', '\1')
file{"${concatdir}/bin/concatfragments.sh":