From: Sharif Nassar <sharif@mediatemple.net>
Date: Wed, 23 May 2012 21:35:08 +0000 (-0700)
Subject: Fail with helpful advice if $::concat_basedir is not yet set
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=21d0d2abf2542aaf2f60c9028a8f6653351af0e1;p=puppet-concat.git

Fail with helpful advice if $::concat_basedir is not yet set

Building on the new docs in https://github.com/ripienaar/puppet-concat/pull/20
---

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":