| 1 |
mgorny 13/10/27 13:33:45 |
| 2 |
|
| 3 |
Modified: ChangeLog git-r3.eclass |
| 4 |
Log: |
| 5 |
Strip sub-slot from local repo IDs. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1038 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1038&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1038&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1037&r2=1.1038 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1037 |
| 18 |
retrieving revision 1.1038 |
| 19 |
diff -u -r1.1037 -r1.1038 |
| 20 |
--- ChangeLog 27 Oct 2013 07:27:52 -0000 1.1037 |
| 21 |
+++ ChangeLog 27 Oct 2013 13:33:44 -0000 1.1038 |
| 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.1037 2013/10/27 07:27:52 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1038 2013/10/27 13:33:44 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 27 Oct 2013; Michał Górny <mgorny@g.o> git-r3.eclass: |
| 29 |
+ Strip sub-slot from local repo IDs. |
| 30 |
|
| 31 |
27 Oct 2013; Michał Górny <mgorny@g.o> python-utils-r1.eclass: |
| 32 |
Remove deprecated functions. |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.20 eclass/git-r3.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.20&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.20&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.19&r2=1.20 |
| 41 |
|
| 42 |
Index: git-r3.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v |
| 45 |
retrieving revision 1.19 |
| 46 |
retrieving revision 1.20 |
| 47 |
diff -u -r1.19 -r1.20 |
| 48 |
--- git-r3.eclass 26 Oct 2013 06:19:13 -0000 1.19 |
| 49 |
+++ git-r3.eclass 27 Oct 2013 13:33:44 -0000 1.20 |
| 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.19 2013/10/26 06:19:13 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.20 2013/10/27 13:33:44 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: git-r3.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -374,7 +374,7 @@ |
| 59 |
# <local-id> specifies the local branch identifier that will be used to |
| 60 |
# locally store the fetch result. It should be unique to multiple |
| 61 |
# fetches within the repository that can be performed at the same time |
| 62 |
-# (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT}. |
| 63 |
+# (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT%/*}. |
| 64 |
# This default should be fine unless you are fetching multiple trees |
| 65 |
# from the same repository in the same ebuild. |
| 66 |
# |
| 67 |
@@ -398,7 +398,7 @@ |
| 68 |
|
| 69 |
local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}} |
| 70 |
local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}} |
| 71 |
- local local_id=${3:-${CATEGORY}/${PN}/${SLOT}} |
| 72 |
+ local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}} |
| 73 |
local local_ref=refs/heads/${local_id}/__main__ |
| 74 |
|
| 75 |
[[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset" |
| 76 |
@@ -561,7 +561,7 @@ |
| 77 |
fi |
| 78 |
|
| 79 |
local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}} |
| 80 |
- local local_id=${3:-${CATEGORY}/${PN}/${SLOT}} |
| 81 |
+ local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}} |
| 82 |
|
| 83 |
local -x GIT_DIR GIT_WORK_TREE |
| 84 |
_git-r3_set_gitdir "${repos[0]}" |
Archives