X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=tools%2Fgit-hooks%2Fpre-commit;h=4406089770ba7baaaa39f81b915040a00a918e40;hb=b90dd21bd4c11b820bbc61b570c400885d16458d;hp=243f06292bf31be98b6a9ba28582a794440ddefb;hpb=09e1d27cb215e73b1e80684b9e4b13e5ab93a29b;p=mirror%2Fdsa-puppet.git

diff --git a/tools/git-hooks/pre-commit b/tools/git-hooks/pre-commit
index 243f06292..440608977 100755
--- a/tools/git-hooks/pre-commit
+++ b/tools/git-hooks/pre-commit
@@ -21,7 +21,7 @@ check_puppet_manifest () {
         git cat-file blob :0:${file} | sed 's/^import .*/#&/' >${pp}
         trap "rm -f ${pp}" RETURN
 
-        local output=$(puppet parser validate --storeconfigs true ${pp} 2>&1)
+        local output=$(puppet parser validate ${pp} 2>&1)
         if [ $? -ne 0 ] || [ -n "${output}" ]; then
                 echo '** Syntax check failed:' >&2
                 echo "${output}" >&2
@@ -70,7 +70,7 @@ check_puppet_manifest () {
         case "${file}" in
                 manifests/site.pp|modules/*/manifests/*)
                         if [[ -n "$(which puppet-lint)" ]]; then
-                                puppet-lint --no-hard_tabs-check --no-80chars-check ${pp} >&2 | uniq
+                                puppet-lint --no-hard_tabs-check --no-2sp_soft_tabs-check --no-80chars-check ${pp} >&2 | uniq
 			else
 				echo "Please install puppet-lint (gem install puppet-lint)" >&2
                         fi