mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	apply_patches: Sort patch list before applying
The apply_patches script wasn't sorting the list of patches in the "patches" directory before applying them. This left the list in an indeterminate order. In most cases, the list is actually sorted but rarely, they can be out of order and cause dependent patches to fail to apply. We now sort the list but the "sort" program wasn't in the configure scripts so we needed to add that and regenerate the scripts as well. Resolves: #193
This commit is contained in:
		
				
					committed by
					
						 AsteriskCI2
						AsteriskCI2
					
				
			
			
				
	
			
			
			
						parent
						
							e341a41578
						
					
				
				
					commit
					7a725e3159
				
			
							
								
								
									
										3
									
								
								third-party/apply_patches
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								third-party/apply_patches
									
									
									
									
										vendored
									
									
								
							| @@ -7,6 +7,7 @@ fi | ||||
|  | ||||
| PATCH=${PATCH:-patch} | ||||
| FIND=${FIND:-find} | ||||
| SORT=${SORT:-sort} | ||||
|  | ||||
| patchdir=${1:?You must supply a patches directory} | ||||
| sourcedir=${2?:You must supply a source directory} | ||||
| @@ -21,7 +22,7 @@ if [ ! -d "$sourcedir" ] ; then | ||||
| 	exit 1 | ||||
| fi | ||||
|  | ||||
| patches=$(${FIND} "$patchdir" -name "*.patch") | ||||
| patches=$(${FIND} "$patchdir" -name "*.patch" | ${SORT}) | ||||
| if [ x"$patches" = x"" ] ; then | ||||
| 	echo "No patches in $patchdir"  >&2 | ||||
| 	exit 0 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user