diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2013-03-18 03:31:49 -0700 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2013-03-18 03:31:49 -0700 |
| commit | 0aa01df4742ac55385e1eb8a0421e2cd1d7ce14f (patch) | |
| tree | 37ee4482a666eac29372efe2e788ade2b30d78f6 /manifests/lens.pp | |
| parent | 8df48d003efcf055b27593091fb981c5c193bc6a (diff) | |
| parent | a7c41208cc4a6e9b543487bf606b551307fdc05a (diff) | |
Merge pull request #23 from raphink/dev/reorganize
Refactor the module
Diffstat (limited to 'manifests/lens.pp')
| -rw-r--r-- | manifests/lens.pp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/manifests/lens.pp b/manifests/lens.pp index 55dc9ae..723f217 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -29,12 +29,14 @@ define augeas::lens ( $test_source=false, $stock_since=false, ) { + if !defined(Class['augeas']) { + fail('You must declare the augeas class before using augeas::lens') + } - if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - include augeas::base + if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { - $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], } |