Detect and abort on partially patched component.

/trunk/scripts/functions |   18    15     3     0 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
This commit is contained in:
Yann E. MORIN" 2009-03-27 21:30:47 +00:00
parent b79ffe16c6
commit 3a181fe514

View File

@ -642,9 +642,9 @@ CT_Extract() {
# Some tarballs have read-only files... :-(
# Because of nochdir, we don't know where we are, so chmod all
# the src tree
chmod -R u+w "${CT_SRC_DIR}"
CT_DoExecLog DEBUG chmod -R u+w "${CT_SRC_DIR}"
touch "${CT_SRC_DIR}/.${basename}.extracted"
CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.${basename}.extracted"
[ "${nochdir}" = "nochdir" ] || CT_Popd
}
@ -665,6 +665,17 @@ CT_Patch() {
return 0
fi
# Check if already partially patched
if [ -e "${CT_SRC_DIR}/.${basename}.patching" ]; then
CT_DoLog ERROR "The '${basename}' sources were partially patched."
CT_DoLog ERROR "Please remove first:"
CT_DoLog ERROR " - the source dir for '${basename}', in '${CT_SRC_DIR}'"
CT_DoLog ERROR " - the file '${CT_SRC_DIR}/.${basename}.extracted'"
CT_DoLog ERROR " - the file '${CT_SRC_DIR}/.${basename}.patching'"
CT_Abort "I'll stop now to avoid any carnage..."
fi
touch "${CT_SRC_DIR}/.${basename}.patching"
[ "${nochdir}" = "nochdir" ] || CT_Pushd "${CT_SRC_DIR}/${basename}"
CT_DoLog EXTRA "Patching '${basename}'"
@ -695,7 +706,8 @@ CT_Patch() {
done
fi
touch "${CT_SRC_DIR}/.${basename}.patched"
CT_DoExecLog DEBUG rm -f "${CT_SRC_DIR}/.${basename}.patching"
CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.${basename}.patched"
[ "${nochdir}" = "nochdir" ] || CT_Popd
}