forked from ungleich-public/cdist
		
	fix typo: /object/newobject/
Signed-off-by: Steven Armstrong <steven.armstrong@inf.ethz.ch>
This commit is contained in:
		
					parent
					
						
							
								17e24b6a75
							
						
					
				
			
			
				commit
				
					
						a7fc721488
					
				
			
		
					 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."
 | 
					                  __cdist_exit_err "${newobject} already exists, merge failed."
 | 
				
			||||||
               else
 | 
					               else
 | 
				
			||||||
                  # Fine, merge back! FIXME: touch correct here?
 | 
					                  # Fine, merge back! FIXME: touch correct here?
 | 
				
			||||||
                  touch "${object}/$__cdist_object_finished"
 | 
					                  touch "${newobject}/$__cdist_object_finished"
 | 
				
			||||||
                  pax -r -w "$newobject" "$__cdist_object_dir"
 | 
					                  pax -r -w "$newobject" "$__cdist_object_dir"
 | 
				
			||||||
               fi
 | 
					               fi
 | 
				
			||||||
            done < "$__cdist_tmp_file"
 | 
					            done < "$__cdist_tmp_file"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue