fgerlits commented on a change in pull request #973:
URL: https://github.com/apache/nifi-minifi-cpp/pull/973#discussion_r557480936
##########
File path: cmake/BundledOSSPUUID.cmake
##########
@@ -21,8 +21,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
message("Using bundled ossp-uuid")
# Define patch step
- set(PC "${Patch_EXECUTABLE}" -p1 -i
"${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch" &&
- "${Patch_EXECUTABLE}" -p1 -i
"${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-no-prog.patch")
+ set(PC "${Patch_EXECUTABLE}" -p1 -N -r- -i
"${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch" &&
+ "${Patch_EXECUTABLE}" -p1 -N -r- -i
"${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-no-prog.patch" || :)
Review comment:
That `|| :` is not very nice -- is it there because of the "patch
already applied" error we sometimes get? I haven't seen that error too many
times, and I'd rather do a clean rebuild (until we can fix the problem
properly) than possibly ignore real errors thrown by `patch`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
