From e8bb6fff5cbb40d8a8ed0ecb462af99c23797208 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 19 Jan 2012 16:53:39 +0000 Subject: Strip .git from storedir; wrt bug #386845. --- eclass/ChangeLog | 5 ++++- eclass/git-2.eclass | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'eclass') diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 620bf9f8036a..e7719e2a697b 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.96 2012/01/19 10:12:44 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.97 2012/01/19 16:53:39 mgorny Exp $ + + 19 Jan 2012; Michał Górny git-2.eclass: + Strip .git from storedir; wrt bug #386845. 19 Jan 2012; Matti Bickel php-ext-source-r2.eclass: Added addpredict to src_configure phase because of bug #385403 diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass index f1ed79f98b4a..da90f00ee492 100644 --- a/eclass/git-2.eclass +++ b/eclass/git-2.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.27 2011/12/14 23:40:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.28 2012/01/19 16:53:39 mgorny Exp $ # @ECLASS: git-2.eclass # @MAINTAINER: @@ -278,7 +278,8 @@ git-2_prepare_storedir() { if [[ ${EGIT_PROJECT} ]]; then clone_dir=${EGIT_PROJECT} else - clone_dir=${EGIT_REPO_URI##*/} + local strippeduri=${EGIT_REPO_URI%/.git} + clone_dir=${strippeduri##*/} fi EGIT_DIR=${EGIT_STORE_DIR}/${clone_dir} -- cgit v1.2.3-65-gdbad