summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-09-19 09:42:32 +0000
committerMichał Górny <mgorny@gentoo.org>2013-09-19 09:42:32 +0000
commitdf43ea1f713f54f28c78c6313db3bcb06ee0d343 (patch)
tree7c063073355187715fde577a507f8bc23fbf6392 /eclass
parentDo not even create shallow repository when EGIT_NONSHALLOW is set. Otherwise,... (diff)
downloadgentoo-2-df43ea1f713f54f28c78c6313db3bcb06ee0d343.tar.gz
gentoo-2-df43ea1f713f54f28c78c6313db3bcb06ee0d343.tar.bz2
gentoo-2-df43ea1f713f54f28c78c6313db3bcb06ee0d343.zip
Strip trailing slashes from repo URI when determining local copy directory.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/git-r3.eclass5
2 files changed, 8 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index c5e9ba3a0db0..232b0a66cf28 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.979 2013/09/19 09:37:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.980 2013/09/19 09:42:32 mgorny Exp $
+
+ 19 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
+ Strip trailing slashes from repo URI when determining local copy directory.
19 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Do not even create shallow repository when EGIT_NONSHALLOW is set. Otherwise,
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index bfbc67d42a05..dd8cccb8535a 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.6 2013/09/19 09:37:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.7 2013/09/19 09:42:32 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -171,6 +171,9 @@ _git-r3_set_gitdir() {
local repo_name=${1#*://*/}
+ # strip the trailing slash
+ repo_name=${repo_name%/}
+
# strip common prefixes to make paths more likely to match
# e.g. git://X/Y.git vs https://X/git/Y.git
# (but just one of the prefixes)