Check that a pacakge was previously extracted prior to patching.
Fix a comment.
/trunk/scripts/functions | 8 5 3 0 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
1.1 --- a/scripts/functions Wed Mar 04 17:59:35 2009 +0000
1.2 +++ b/scripts/functions Wed Mar 04 18:25:58 2009 +0000
1.3 @@ -180,8 +180,8 @@
1.4 }
1.5
1.6 # Search a program: wrap "which" for those system where
1.7 -# "which" verbosely says there is no match (Mdk are such
1.8 -# suckers...)
1.9 +# "which" verbosely says there is no match (Mandriva is
1.10 +# such a sucker...)
1.11 # Usage: CT_Which <filename>
1.12 CT_Which() {
1.13 which "$1" 2>/dev/null || true
1.14 @@ -445,7 +445,6 @@
1.15 CT_DoLog DEBUG "Trying to retrieve an already downloaded copy of '${basename}'"
1.16 # We'd rather have a bzip2'ed tarball, then gzipped tarball, plain tarball,
1.17 # or, as a failover, a file without extension.
1.18 - # Try local copy first, if it exists
1.19 for ext in ${first_ext} .tar.bz2 .tar.gz .tgz .tar ''; do
1.20 CT_DoLog DEBUG "Trying '${CT_LOCAL_TARBALLS_DIR}/${basename}${ext}'"
1.21 if [ -r "${CT_LOCAL_TARBALLS_DIR}/${basename}${ext}" -a \
1.22 @@ -636,6 +635,9 @@
1.23 return 0
1.24 fi
1.25
1.26 + # Check if already extracted
1.27 + CT_TestOrAbort "'${basename}' is not yet extracted while attempting to patch" -e "${CT_SRC_DIR}/.${basename}.extracted"
1.28 +
1.29 [ "${nochdir}" = "nochdir" ] || CT_Pushd "${CT_SRC_DIR}/${basename}"
1.30
1.31 CT_DoLog EXTRA "Patching '${basename}'"