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(-)
1.1 --- a/scripts/functions Fri Mar 13 10:34:53 2009 +0000
1.2 +++ b/scripts/functions Sun Mar 15 20:06:40 2009 +0000
1.3 @@ -640,11 +640,9 @@
1.4 esac
1.5
1.6 # Some tarballs have read-only files... :-(
1.7 - if [ "${nochdir}" = "nochdir" ]; then
1.8 - chmod -R u+w .
1.9 - else
1.10 - chmod -R u+w "${basename}"
1.11 - fi
1.12 + # Because of nochdir, we don't know where we are, so chmod all
1.13 + # the src tree
1.14 + chmod -R u+w "${CT_SRC_DIR}"
1.15
1.16 touch "${CT_SRC_DIR}/.${basename}.extracted"
1.17
1.18 @@ -667,9 +665,6 @@
1.19 return 0
1.20 fi
1.21
1.22 - # Check if already extracted
1.23 - CT_TestOrAbort "'${basename}' is not yet extracted while attempting to patch" -e "${CT_SRC_DIR}/.${basename}.extracted"
1.24 -
1.25 [ "${nochdir}" = "nochdir" ] || CT_Pushd "${CT_SRC_DIR}/${basename}"
1.26
1.27 CT_DoLog EXTRA "Patching '${basename}'"