[gentoo-commits] gentoo-x86 commit in eclass: subversion.eclass

[Bo Oersted Andresen (zlin)]

zlin        08/02/21 13:38:37

  Modified:             subversion.eclass
  Log:
  Unbreak subversion__get_repository_uri(). Warn when ESVN_OFFLINE is set while there is no checkout.

Revision  Changes    Path
1.53                 eclass/subversion.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/subversion.eclass?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/subversion.eclass?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/subversion.eclass?r1=1.52&r2=1.53

Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- subversion.eclass	20 Feb 2008 22:35:40 -0000	1.52
+++ subversion.eclass	21 Feb 2008 13:38:36 -0000	1.53
@@ -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 @@
 #   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 @@
 	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 @@
 #
 # 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}"
 



-- 
gentoo-commits@l.g.o mailing list