thijso/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

[__directory] Give more precise error message when --state pre-exists

Browse source
This commit is contained in:
Dennis Camera 2020-02-26 16:12:21 +01:00
parent 2cf44c66d4
commit 6b4b6534a1
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cdist/conf/type/__directory/gencode-remote
View file

@ -109,10 +109,24 @@ case "$state_should" in
done done
;; ;;
pre-exists) pre-exists)
if [ "$type" != "directory" ]; then case $type in
echo "Directory \"$destination\" does not exist" >&2 directory)
exit 1 # all good
fi exit 0
;;
none)
printf 'Directory "%s" does not exist\n' "$destination" >&2
exit 1
;;
file|symlink)
printf 'File "%s" exists and is a %s, but should be a directory\n' "$destination" "$type" >&2
exit 1
;;
*)
printf 'File or directory "%s" is in an unknown state\n' "$destination" >&2
exit 1
;;
esac
;; ;;
absent) absent)
if [ "$type" = "directory" ]; then if [ "$type" = "directory" ]; then