@@ -56,7 +56,6 @@ function(is_backport_patch_present patch_path repo_dir patch_in_branch)
56
56
WORKING_DIRECTORY ${repo_dir}
57
57
RESULT_VARIABLE patch_not_in_branches
58
58
OUTPUT_QUIET
59
- ERROR_QUIET
60
59
)
61
60
if (patch_not_in_branches)
62
61
set (patch_in_branch False PARENT_SCOPE) # The patch is not present in local branch
@@ -73,7 +72,6 @@ function(is_valid_revision repo_dir revision return_val)
73
72
COMMAND ${GIT_EXECUTABLE} log -1 ${revision}
74
73
WORKING_DIRECTORY ${repo_dir}
75
74
RESULT_VARIABLE output_var
76
- ERROR_QUIET
77
75
OUTPUT_QUIET
78
76
)
79
77
if (${output_var} EQUAL 0)
@@ -101,14 +99,13 @@ function(apply_patches repo_dir patches_dir base_revision target_branch)
101
99
COMMAND ${GIT_EXECUTABLE} rev-parse --verify --no -revs -q ${target_branch}
102
100
WORKING_DIRECTORY ${repo_dir}
103
101
RESULT_VARIABLE patches_needed
104
- ERROR_QUIET
105
102
OUTPUT_QUIET
106
103
)
107
- if (patches_needed EQUAL " 128" )
108
- message (STATUS "[OPENCL-CLANG] ${repo_dir} is not a git repository" )
104
+ if (patches_needed EQUAL 128)
105
+ message (STATUS "[OPENCL-CLANG][Warning] ${repo_dir} is not a git repository, therefore, local patches are not applied " )
109
106
return ()
110
107
endif ()
111
- if (patches_needed EQUAL "1" ) # The target branch doesn't exist
108
+ if (patches_needed EQUAL 1 ) # The target branch doesn't exist
112
109
list (SORT patches)
113
110
is_valid_revision(${repo_dir} ${base_revision} exists_base_rev)
114
111
@@ -118,7 +115,6 @@ function(apply_patches repo_dir patches_dir base_revision target_branch)
118
115
WORKING_DIRECTORY ${repo_dir}
119
116
OUTPUT_VARIABLE repo_head
120
117
OUTPUT_STRIP_TRAILING_WHITESPACE
121
- ERROR_QUIET
122
118
)
123
119
message (STATUS "[OPENCL-CLANG] ref ${base_revision} not exists in repository, using current HEAD:${repo_head} " )
124
120
set (base_revision ${repo_head} )
@@ -141,19 +137,20 @@ function(apply_patches repo_dir patches_dir base_revision target_branch)
141
137
COMMAND ${GIT_EXECUTABLE} am --3way --ignore -whitespace ${patch}
142
138
WORKING_DIRECTORY ${repo_dir}
143
139
OUTPUT_VARIABLE patching_log
144
- ERROR_QUIET
145
140
)
146
141
message (STATUS "[OPENCL-CLANG] Not present - ${patching_log} " )
147
142
endif ()
148
143
endforeach (patch)
149
- elsef(patches_needed EQUAL "0" ) # The target branch already exists
144
+ elsef(patches_needed EQUAL 0 ) # The target branch already exists
150
145
execute_process ( # Check it out
151
146
COMMAND ${GIT_EXECUTABLE} checkout ${target_branch}
152
147
WORKING_DIRECTORY ${repo_dir}
153
- ERROR_QUIET
154
148
OUTPUT_QUIET
155
149
)
156
150
endif ()
151
+ if (ret_check_out OR ret_apply_patch)
152
+ message (FATAL_ERROR "[OPENCL-CLANG] Failed to apply patch!" )
153
+ endif ()
157
154
endfunction ()
158
155
159
156
# Usage
0 commit comments