diff options
Diffstat (limited to 'eclass/subversion.eclass')
| -rw-r--r-- | eclass/subversion.eclass | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index cead495..d24504c 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -124,7 +124,8 @@ ESVN_UPDATE_CMD="svn update" # function subversion_fetch() { - local repo_uri="$(subversion__get_repository_uri "${@}")" + local repo_uri="$(subversion__get_repository_uri "${1}")" + local S_dest="${2}" # check for the protocol local protocol="${repo_uri%%:*}" @@ -157,9 +158,10 @@ function subversion_fetch() { cd "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}" - local wc_path="$(subversion__get_wc_path "${repo_url}")" + local wc_path="$(subversion__get_wc_path "${repo_uri}")" local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" + debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" debug-print "${FUNCNAME}: options = \"${options}\"" @@ -197,6 +199,8 @@ function subversion_fetch() { if ! has "export" ${ESVN_RESTRICT}; then cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" + local S="${S}/${S_dest}" + # export to the ${WORKDIR} #* "svn export" has a bug. see http://bugs.gentoo.org/119236 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." @@ -279,9 +283,12 @@ function subversion_src_unpack() { # function subversion_wc_info() { - local repo_uri="$(subversion__get_repository_uri "${@}")" + local repo_uri="$(subversion__get_repository_uri "${1}")" local wc_path="$(subversion__get_wc_path "${repo_uri}")" + debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" + debug-print "${FUNCNAME}: wc_path = ${wc_path}" + if [[ ! -e "${wc_path}" ]]; then return 1 fi |