From 6d392339c61a4d2f424da60edfa6c1269dad30d2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 15 Mar 2009 20:06:40 +0000 Subject: 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 --git a/scripts/functions b/scripts/functions index 5005974..cafc6b2 100644 --- a/scripts/functions +++ b/scripts/functions @@ -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}'" -- cgit v0.10.2-6-g49f6