From 6e5ed1c8e80e1afb184b2bc498ea080ad5feca12 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 23 Mar 2011 11:56:19 +0100 Subject: [PATCH] re-include requirement recording Signed-off-by: Nico Schottelius --- bin/cdist-type-emulator | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/bin/cdist-type-emulator b/bin/cdist-type-emulator index 18171233..7cb8e450 100755 --- a/bin/cdist-type-emulator +++ b/bin/cdist-type-emulator @@ -99,16 +99,20 @@ while [ $# -gt 0 ]; do echo "${value}" > "${__cdist_parameter_dir}/${opt_file}" done -find $__cdist_object_dir +# Record requirements +# it's fine, if it's not set +set +u +for requirement in $require; do + echo $requirement >> "$(__cdist_object_require "$__cdist_object_self")" + echo Object $__cdist_object_self requires $requirement +done + exit 1 - - ################################################################################ -# Try to merge object into global object directory +# Check newly created object # - # Ensure required parameters are given if [ -f "$(__cdist_type_parameter_required "$__cdist_type")" ]; then while read required; do @@ -133,17 +137,12 @@ fi cd "${tempparameter}" other="$(ls)" +exit 1 + if [ "$other" ]; then __cdist_usage "Unsupported parameter: $other" fi -# Record requirements -# it's fine, if it's not set -set +u -for requirement in $require; do - echo $requirement >> "$(__cdist_object_require "$__cdist_object")" - echo Recording: $__cdist_object requires $requirement -done # old stuff