From a8398ea01ab19eafc55b800e07ab12b986dff2b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bo=20=C3=98rsted=20Andresen?= Date: Wed, 20 Feb 2008 22:28:49 +0000 Subject: [PATCH] As kindly pointed out by David Leverton there is no requirement to define ESVN_REPO_URI before inheriting this eclass. On the other hand subversion_src_fetch must die if repo_uri is unset. --- eclass/subversion.eclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index abc8a057e6f3..872183d33f43 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.50 2008/02/20 20:36:30 zlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.51 2008/02/20 22:28:49 zlin Exp $ # @ECLASS: subversion.eclass # @MAINTAINER: @@ -13,8 +13,6 @@ # @DESCRIPTION: # The subversion eclass provides functions to fetch, patch and bootstrap # software sources from subversion repositories. -# -# You must define the ESVN_REPO_URI variable before inheriting this eclass. inherit eutils @@ -153,6 +151,10 @@ subversion_fetch() { local revision="$(subversion__get_peg_revision "${1:-${ESVN_REPO_URI}}")" local S_dest="${2}" + if [[ -z ${repo_uri} ]]; then + die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." + fi + [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}" # check for the protocol @@ -431,4 +433,4 @@ subversion_pkg_preinst() { eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'" fi fi -} \ No newline at end of file +} -- 2.26.2