forked from ungleich-public/cdist
		
	re-include requirement recording
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
		
					parent
					
						
							
								d8f7ebc73f
							
						
					
				
			
			
				commit
				
					
						6e5ed1c8e8
					
				
			
		
					 1 changed files with 11 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue