mirror of
https://github.com/unrealircd/unrealircd.git
synced 2026-06-12 17:14:46 +02:00
Fix ./unrealircd hot-patch: if a patch does not cleanly apply then
don't apply it. The dry-run code was missing the most obvious case..
This commit is contained in:
@@ -242,6 +242,11 @@ elif [ "$1" = "hot-patch" -o "$1" = "cold-patch" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! patch --dry-run -p1 -N <patch 1>/dev/null 2>&1; then
|
||||
echo "Patch failed to apply (no files changed)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! patch -p1 <patch; then
|
||||
echo "Patch failed to apply"
|
||||
exit 1
|
||||
|
||||
Reference in New Issue
Block a user