From 883176550cd70b90f3393b4228ba1de826c3fb45 Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Sun, 29 Jul 2012 05:54:17 +0000 Subject: add support for file:// URI scheme wrt bug #416649 --- eclass/ChangeLog | 5 ++++- eclass/subversion.eclass | 15 +++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'eclass') diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 745fce9f64c3..4fcc59c807e0 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.360 2012/07/29 05:38:42 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.361 2012/07/29 05:54:17 hattya Exp $ + + 29 Jul 2012; Akinori Hattori subversion.eclass: + add support for file:// URI scheme wrt bug #416649 29 Jul 2012; Akinori Hattori subversion.eclass: replace built_with_use by USE deps wrt bug #242100 diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index c25d3eb192a2..6f90ab8dfb53 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.82 2012/07/29 05:38:42 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.83 2012/07/29 05:54:17 hattya Exp $ # @ECLASS: subversion.eclass # @MAINTAINER: @@ -61,11 +61,12 @@ ESVN_OPTIONS="${ESVN_OPTIONS:-}" # # e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234 # -# supported protocols: +# supported URI schemes: # http:// # https:// # svn:// # svn+ssh:// +# file:// # # to peg to a specific revision, append @REV to the repo's uri ESVN_REPO_URI="${ESVN_REPO_URI:-}" @@ -188,15 +189,17 @@ subversion_fetch() { [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}" - # check for the protocol - local protocol="${repo_uri%%:*}" - case "${protocol}" in + # check for the scheme + local scheme="${repo_uri%%:*}" + case "${scheme}" in http|https) ;; svn|svn+ssh) ;; + file) + ;; *) - die "${ESVN}: fetch from '${protocol}' is not yet implemented." + die "${ESVN}: fetch from '${scheme}' is not yet implemented." ;; esac -- cgit v1.2.3-65-gdbad