When patching, always assume the package has been previously extraacted (don't check).

"chmod u+w" the full src tree: because of nochdir and cvs snapshots, we can't reliably know were we are...

 /trunk/scripts/functions |   11     3     8     0 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
This commit is contained in:
Yann E. MORIN" 2009-03-15 20:06:40 +00:00
parent 36871474d3
commit 6d392339c6

View File

@ -640,11 +640,9 @@ CT_Extract() {
esac
# Some tarballs have read-only files... :-(
if [ "${nochdir}" = "nochdir" ]; then
chmod -R u+w .
else
chmod -R u+w "${basename}"
fi
# Because of nochdir, we don't know where we are, so chmod all
# the src tree
chmod -R u+w "${CT_SRC_DIR}"
touch "${CT_SRC_DIR}/.${basename}.extracted"
@ -667,9 +665,6 @@ CT_Patch() {
return 0
fi
# Check if already extracted
CT_TestOrAbort "'${basename}' is not yet extracted while attempting to patch" -e "${CT_SRC_DIR}/.${basename}.extracted"
[ "${nochdir}" = "nochdir" ] || CT_Pushd "${CT_SRC_DIR}/${basename}"
CT_DoLog EXTRA "Patching '${basename}'"