Browse Source

More sensible defaults; reword debian-only error message

evilham-compatibility-fixes
fancsali 2 years ago
parent
commit
a3102022e1
  1. 13
      cdist/conf/type/__apt_pin/manifest
  2. 0
      cdist/conf/type/__apt_pin/nonparallel
  3. 1
      cdist/conf/type/__apt_pin/parameter/default/package

13
cdist/conf/type/__apt_pin/manifest vendored

@ -19,9 +19,17 @@
#
name="$__object_id"
os=$(cat "$__global/explorer/os")
state="$(cat "$__object/parameter/state")"
package="$(cat "$__object/parameter/package")"
if [ -f "$__object/parameter/package" ]; then
package="$(cat "$__object/parameter/package")"
else
package=$name
fi
distribution="$(cat "$__object/parameter/distribution")"
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 "If you feel there's an equivalent functionality in %s, please contribute..." "$os" >&2
exit 1
;;
esac
name="$__object_id"
case $distribution in
stabletesting|unsatbel|experimental)
pin="release a=$distribution"

0
cdist/conf/type/__apt_pin/nonparallel vendored

1
cdist/conf/type/__apt_pin/parameter/default/package vendored

@ -1 +0,0 @@
*
Loading…
Cancel
Save