| 1 |
mgorny 13/10/26 06:19:13 |
| 2 |
|
| 3 |
Modified: ChangeLog git-r3.eclass |
| 4 |
Log: |
| 5 |
Fix handling relative submodule paths. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1034 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1034&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1034&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1033&r2=1.1034 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1033 |
| 18 |
retrieving revision 1.1034 |
| 19 |
diff -u -r1.1033 -r1.1034 |
| 20 |
--- ChangeLog 22 Oct 2013 19:23:47 -0000 1.1033 |
| 21 |
+++ ChangeLog 26 Oct 2013 06:19:13 -0000 1.1034 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1033 2013/10/22 19:23:47 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1034 2013/10/26 06:19:13 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 26 Oct 2013; Michał Górny <mgorny@g.o> git-r3.eclass: |
| 29 |
+ Fix handling relative submodule paths. |
| 30 |
|
| 31 |
22 Oct 2013; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
| 32 |
Fix failing to pass default install arguments when user passes an additional |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.19 eclass/git-r3.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.19&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.19&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.18&r2=1.19 |
| 41 |
|
| 42 |
Index: git-r3.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v |
| 45 |
retrieving revision 1.18 |
| 46 |
retrieving revision 1.19 |
| 47 |
diff -u -r1.18 -r1.19 |
| 48 |
--- git-r3.eclass 14 Oct 2013 20:30:00 -0000 1.18 |
| 49 |
+++ git-r3.eclass 26 Oct 2013 06:19:13 -0000 1.19 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2013 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.18 2013/10/14 20:30:00 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.19 2013/10/26 06:19:13 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: git-r3.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -515,8 +515,13 @@ |
| 59 |
if [[ ! ${commit} ]]; then |
| 60 |
die "Unable to get commit id for submodule ${subname}" |
| 61 |
fi |
| 62 |
+ if [[ ${url} == ./* || ${url} == ../* ]]; then |
| 63 |
+ local subrepos=( "${repos[@]/%//${url}}" ) |
| 64 |
+ else |
| 65 |
+ local subrepos=( "${url}" ) |
| 66 |
+ fi |
| 67 |
|
| 68 |
- git-r3_fetch "${url}" "${commit}" "${local_id}/${subname}" |
| 69 |
+ git-r3_fetch "${subrepos[*]}" "${commit}" "${local_id}/${subname}" |
| 70 |
|
| 71 |
submodules=( "${submodules[@]:3}" ) # shift |
| 72 |
done |
| 73 |
@@ -615,6 +620,10 @@ |
| 74 |
local url=${submodules[1]} |
| 75 |
local path=${submodules[2]} |
| 76 |
|
| 77 |
+ if [[ ${url} == ./* || ${url} == ../* ]]; then |
| 78 |
+ url=${repos[0]%%/}/${url} |
| 79 |
+ fi |
| 80 |
+ |
| 81 |
git-r3_checkout "${url}" "${GIT_WORK_TREE}/${path}" \ |
| 82 |
"${local_id}/${subname}" |
Archives