diff options
| author |   Bo Ørsted Andresen <zlin@gentoo.org> | 2008-02-21 13:38:36 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-02-21 13:38:36 +0000 |
| commit | 32b5fa23208989a4fc8dbacd9aab467347e75cbe (patch) | |
| tree | c2446b79cc0018c30aa46f10fc5beb6305850723 /eclass | |
| parent | alpha/ia64 stable wrt #208870 (diff) | |
| download | gentoo-2-32b5fa23208989a4fc8dbacd9aab467347e75cbe.tar.gz gentoo-2-32b5fa23208989a4fc8dbacd9aab467347e75cbe.tar.bz2 gentoo-2-32b5fa23208989a4fc8dbacd9aab467347e75cbe.zip | |
Unbreak subversion__get_repository_uri(). Warn when ESVN_OFFLINE is set while there is no checkout.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/subversion.eclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index d5e16fe8d5da..f51bee0a33c4 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.52 2008/02/20 22:35:40 zlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.53 2008/02/21 13:38:36 zlin Exp $ # @ECLASS: subversion.eclass # @MAINTAINER: @@ -154,7 +154,7 @@ ESCM_LOGDIR="${ESCM_LOGDIR:=}" # repo_uri - a repository URI. default is ESVN_REPO_URI. # destination - a check out path in S. subversion_fetch() { - local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")" + local repo_uri="$(subversion__get_repository_uri "${1}")" local revision="$(subversion__get_peg_revision "${1:-${ESVN_REPO_URI}}")" local S_dest="${2}" @@ -209,6 +209,9 @@ subversion_fetch() { debug-print "${FUNCNAME}: options = \"${options}\"" if [[ ! -d ${wc_path}/.svn ]]; then + if [[ -n ${ESVN_OFFLINE} ]]; then + ewarn "ESVN_OFFLINE cannot be used when the there is no existing checkout." + fi # first check out einfo "subversion check out start -->" einfo " repository: ${repo_uri}${revision:+@}${revision}" @@ -380,7 +383,7 @@ subversion__svn_info() { # # param $1 - a repository URI. subversion__get_repository_uri() { - local repo_uri="${1}" + local repo_uri="${1:-${ESVN_REPO_URI}}" debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" |