forked from ungleich-public/cdist
		
	Merge remote-tracking branch 'sans/master'
This commit is contained in:
		
				commit
				
					
						2e717cc50c
					
				
			
		
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -86,7 +86,7 @@ while [ "$__cdist_object_created_new" = 1 ]; do
 | 
			
		|||
                  __cdist_exit_err "${newobject} already exists, merge failed."
 | 
			
		||||
               else
 | 
			
		||||
                  # Fine, merge back! FIXME: touch correct here?
 | 
			
		||||
                  touch "${object}/$__cdist_object_finished"
 | 
			
		||||
                  touch "${newobject}/$__cdist_object_finished"
 | 
			
		||||
                  pax -r -w "$newobject" "$__cdist_object_dir"
 | 
			
		||||
               fi
 | 
			
		||||
            done < "$__cdist_tmp_file"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue