From e86f20b2435ec251c6373baf4c2ee36d5f26b83e Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 25 Nov 2013 01:20:52 -0800 Subject: fixed `diff` bug with try::file and directories --- puppet/modules/try/manifests/file.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet/modules/try/manifests/file.pp b/puppet/modules/try/manifests/file.pp index 56a7c997..cd1bb035 100644 --- a/puppet/modules/try/manifests/file.pp +++ b/puppet/modules/try/manifests/file.pp @@ -58,14 +58,14 @@ define try::file ( exec { "rsync_${name}": command => "/usr/bin/rsync -r --delete '${source}/' '${name}'", onlyif => "/usr/bin/test -d '${source}'", - unless => "/usr/bin/diff -q '${source}' '${name}'", + unless => "/usr/bin/diff -rq '${source}' '${name}'", notify => [Exec["chmod_${name}"], Exec["chown_${name}"], Exec["chgrp_${name}"]] } } else { exec { "cp_r_${name}": command => "/bin/cp -r '${source}' '${name}'", onlyif => "/usr/bin/test -d '${source}'", - unless => "/usr/bin/diff -q '${source}' '${name}'", + unless => "/usr/bin/diff -rq '${source}' '${name}'", notify => [Exec["chmod_${name}"], Exec["chown_${name}"], Exec["chgrp_${name}"]] } } -- cgit v1.2.3