scripts/functions: fix extraction
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Jan 09 17:31:25 2010 +0100 (2010-01-09)
changeset 1718fa028a13929e
parent 1717 0f884f75dce8
child 1719 5c0d326c2cea
scripts/functions: fix extraction
scripts/functions
     1.1 --- a/scripts/functions	Sat Jan 09 15:57:07 2010 +0100
     1.2 +++ b/scripts/functions	Sat Jan 09 17:31:25 2010 +0100
     1.3 @@ -577,6 +577,12 @@
     1.4      fi
     1.5      local full_file="${CT_TARBALLS_DIR}/${basename}${ext}"
     1.6  
     1.7 +    # Check if already extracted
     1.8 +    if [ -e "${CT_SRC_DIR}/.${basename}.extracted" ]; then
     1.9 +        CT_DoLog DEBUG "Already extracted '${basename}'"
    1.10 +        return 0
    1.11 +    fi
    1.12 +
    1.13      # Check if previously partially extracted
    1.14      if [ -e "${CT_SRC_DIR}/.${basename}.extracting" ]; then
    1.15          CT_DoLog ERROR "The '${basename}' sources were partially extracted."
    1.16 @@ -587,12 +593,6 @@
    1.17      fi
    1.18      CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.${basename}.extracting"
    1.19  
    1.20 -    # Check if already extracted
    1.21 -    if [ -e "${CT_SRC_DIR}/.${basename}.extracted" ]; then
    1.22 -        CT_DoLog DEBUG "Already extracted '${basename}'"
    1.23 -        return 0
    1.24 -    fi
    1.25 -
    1.26      [ "${nochdir}" = "nochdir" ] || CT_Pushd "${CT_SRC_DIR}"
    1.27  
    1.28      CT_DoLog EXTRA "Extracting '${basename}'"
    1.29 @@ -683,8 +683,8 @@
    1.30          done
    1.31      fi
    1.32  
    1.33 +    CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.${basename}.patched"
    1.34      CT_DoExecLog DEBUG rm -f "${CT_SRC_DIR}/.${basename}.patching"
    1.35 -    CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.${basename}.patched"
    1.36  
    1.37      [ "${nochdir}" = "nochdir" ] || CT_Popd
    1.38  }