sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

More sensible defaults; reword debian-only error message

Browse source
This commit is contained in:
fancsali 2021-06-11 15:05:17 +01:00
parent dc66efa690
commit a3102022e1
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cdist/conf/type/__apt_pin/manifest
View file

@ -19,9 +19,17 @@
# #
name="$__object_id"
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
state="$(cat "$__object/parameter/state")" state="$(cat "$__object/parameter/state")"
if [ -f "$__object/parameter/package" ]; then
package="$(cat "$__object/parameter/package")" package="$(cat "$__object/parameter/package")"
else
package=$name
fi
distribution="$(cat "$__object/parameter/distribution")" distribution="$(cat "$__object/parameter/distribution")"
priority="$(cat "$__object/parameter/priority")" priority="$(cat "$__object/parameter/priority")"
@ -31,13 +39,10 @@ case "$os" in
;; ;;
*) *)
printf "This type is specific to Debian and it's derivatives" >&2 printf "This type is specific to Debian and it's derivatives" >&2
printf "If you feel there's an equivalent functionality in %s, please contribute..." "$os" >&2
exit 1 exit 1
;; ;;
esac esac
name="$__object_id"
case $distribution in case $distribution in
stabletesting|unsatbel|experimental) stabletesting|unsatbel|experimental)
pin="release a=$distribution" pin="release a=$distribution"

0
cdist/conf/type/__apt_pin/nonparallel Normal file
View file

1
cdist/conf/type/__apt_pin/parameter/default/package
View file

@ -1 +0,0 @@
*