diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-10-27 13:33:44 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-10-27 13:33:44 +0000 |
| commit | ac825c946d140ae24b4e626f9a663053704a5681 (patch) | |
| tree | af97d5f4506187f41d11fc2259361f5087bc574e | |
| parent | Fix dependency specification (diff) | |
| download | gentoo-2-ac825c946d140ae24b4e626f9a663053704a5681.tar.gz gentoo-2-ac825c946d140ae24b4e626f9a663053704a5681.tar.bz2 gentoo-2-ac825c946d140ae24b4e626f9a663053704a5681.zip | |
Strip sub-slot from local repo IDs.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 2a87d7cf1ebb..2ff477459fbf 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.1037 2013/10/27 07:27:52 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1038 2013/10/27 13:33:44 mgorny Exp $ + + 27 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass: + Strip sub-slot from local repo IDs. 27 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: Remove deprecated functions. diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index fd6886f07373..c025f19fb8da 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.19 2013/10/26 06:19:13 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.20 2013/10/27 13:33:44 mgorny Exp $ # @ECLASS: git-r3.eclass # @MAINTAINER: @@ -374,7 +374,7 @@ _git-r3_smart_fetch() { # <local-id> specifies the local branch identifier that will be used to # locally store the fetch result. It should be unique to multiple # fetches within the repository that can be performed at the same time -# (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT}. +# (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT%/*}. # This default should be fine unless you are fetching multiple trees # from the same repository in the same ebuild. # @@ -398,7 +398,7 @@ git-r3_fetch() { local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}} local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}} - local local_id=${3:-${CATEGORY}/${PN}/${SLOT}} + local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}} local local_ref=refs/heads/${local_id}/__main__ [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset" @@ -561,7 +561,7 @@ git-r3_checkout() { fi local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}} - local local_id=${3:-${CATEGORY}/${PN}/${SLOT}} + local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}} local -x GIT_DIR GIT_WORK_TREE _git-r3_set_gitdir "${repos[0]}" |