From 17afb5f5ad950393f82db8905ffd41d8a37b178b Mon Sep 17 00:00:00 2001 From: Antoine Catton Date: Sat, 27 Dec 2014 20:05:40 -0700 Subject: [PATCH] DRY: Remove default parameter value handeling in __apt_source --- cdist/conf/type/__apt_source/manifest | 8 +++----- cdist/conf/type/__apt_source/parameter/default/component | 0 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 cdist/conf/type/__apt_source/parameter/default/component diff --git a/cdist/conf/type/__apt_source/manifest b/cdist/conf/type/__apt_source/manifest index 0e782716..59c7c567 100755 --- a/cdist/conf/type/__apt_source/manifest +++ b/cdist/conf/type/__apt_source/manifest @@ -27,11 +27,9 @@ if [ -f "$__object/parameter/distribution" ]; then else distribution="$(cat "$__global/explorer/lsb_codename")" fi -if [ -f "$__object/parameter/component" ]; then - component="$(cat "$__object/parameter/component")" -else - component="" -fi + +component="$(cat "$__object/parameter/component")" + if [ -f "$__object/parameter/arch" ]; then forcedarch="[arch=$(cat "$__object/parameter/arch")]" else diff --git a/cdist/conf/type/__apt_source/parameter/default/component b/cdist/conf/type/__apt_source/parameter/default/component new file mode 100644 index 00000000..e69de29b