Skip to content

Commit

Permalink
Accept failed patch in LAMMPS
Browse files Browse the repository at this point in the history
has been merged upstream in development branch
  • Loading branch information
jhenin committed Aug 27, 2024
1 parent 82008b0 commit 74e345e
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions update-colvars-code.sh
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,10 @@ then
done

if [ -f ${source}/lammps/COLVARS.cmake.diff ] ; then
# Do not exit if the patch fails - already applied in development branch
set +e
patch -p1 -N -d ${target} < ${source}/lammps/COLVARS.cmake.diff
set -e
fi

downloaded_pdf=0
Expand Down

0 comments on commit 74e345e

Please sign in to comment.