From: Uwe Köcher Date: Wed, 17 Oct 2018 08:00:11 +0000 (+0200) Subject: moves git cherry-pick to package_unpack just before package_specific_patch X-Git-Tag: v9.0.1-r1~5^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46d529fd96ebc0f4cb8863becd4b90a48e05b3ac;p=candi.git moves git cherry-pick to package_unpack just before package_specific_patch --- diff --git a/candi.sh b/candi.sh index a1cf055..f4c14a5 100755 --- a/candi.sh +++ b/candi.sh @@ -351,15 +351,6 @@ package_fetch () { quit_if_fail "candi: git checkout ${VERSION} --force failed" cd .. fi - - # git cherry-pick on commits given by ${CHERRYPICKCOMMITS} - if [ ${STABLE_BUILD} = true ] && [ ! -z "${CHERRYPICKCOMMITS}" ]; then - cecho ${INFO} "candi: git cherry-pick -X theirs ${CHERRYPICKCOMMITS}" - cd ${EXTRACTSTO} - git cherry-pick -X theirs ${CHERRYPICKCOMMITS} - quit_if_fail "candi: git cherry-pick -X theirs ${CHERRYPICKCOMMITS} failed" - cd .. - fi elif [ ${PACKING} = "hg" ]; then cd ${UNPACK_PATH} @@ -431,6 +422,14 @@ package_unpack() { fi fi + # Apply patches with git cherry-pick of commits given by ${CHERRYPICKCOMMITS} + if [ ${PACKING} = "git" ] && [ ! -z "${CHERRYPICKCOMMITS}" ]; then + cecho ${INFO} "candi: git cherry-pick -X theirs ${CHERRYPICKCOMMITS}" + cd ${UNPACK_PATH}/${EXTRACTSTO} + git cherry-pick -X theirs ${CHERRYPICKCOMMITS} + quit_if_fail "candi: git cherry-pick -X theirs ${CHERRYPICKCOMMITS} failed" + fi + # Apply patches cd ${UNPACK_PATH}/${EXTRACTSTO} package_specific_patch