diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2013-03-13 11:21:59 +0100 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2013-03-13 11:21:59 +0100 |
| commit | 0b807da215eadc363e9c9f67d5da37c034cf73dc (patch) | |
| tree | 293ddb309b7a9af8b6e0300c5f4214ccb00026a6 /manifests | |
| parent | d404a31e789d9e2d90aa1238374a11fd3d3f565b (diff) | |
Fix augeas::lens with new module organization
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/lens.pp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/manifests/lens.pp b/manifests/lens.pp index 55dc9ae..db65d11 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -31,10 +31,12 @@ define augeas::lens ( ) { if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - include augeas::base + if !declared(Class['augeas']) { + fail('You must declare the augeas class before using augeas::lens') + } - $lens_dest = "${augeas::base::lens_dir}/${name}.aug" - $test_dest = "${augeas::base::lens_dir}/tests/test_${name}.aug" + $lens_dest = "${augeas::lens_dir}/${name}.aug" + $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" file { $lens_dest: ensure => $ensure, @@ -42,7 +44,7 @@ define augeas::lens ( } exec { "Typecheck lens ${name}": - command => "augparse -I ${augeas::base::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", + command => "augparse -I ${augeas::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", refreshonly => true, subscribe => File[$lens_dest], } @@ -55,7 +57,7 @@ define augeas::lens ( } exec { "Test lens ${name}": - command => "augparse -I ${augeas::base::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", + command => "augparse -I ${augeas::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", refreshonly => true, subscribe => File[$lens_dest, $test_dest], } |