# HG changeset patch # User "Yann E. MORIN" # Date 1237147600 0 # Node ID 67daa585467b8795688d5f2b144d3858ede4ec5a # Parent ded91847b3b52eadde60f26e72be2e4c16f7e817 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(-) diff -r ded91847b3b5 -r 67daa585467b scripts/functions --- a/scripts/functions Fri Mar 13 10:34:53 2009 +0000 +++ b/scripts/functions Sun Mar 15 20:06:40 2009 +0000 @@ -640,11 +640,9 @@ 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 @@ 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}'"