[gentoo-commits] repo/gentoo:master commit in: eclass/

[William Hubbs]

commit:     2c24ca3867a89ace6bf09b047683c7f4d52f30b1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 23:29:12 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 23:34:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c24ca38

golang-vcs.eclass: fix destination path for source files

This fixes the path under ${WORKDIR} where we are copying the source
files to after they are retrieved from the vcs with "go get".

 eclass/golang-vcs.eclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass
index baf3adf..182c424 100644
--- a/eclass/golang-vcs.eclass
+++ b/eclass/golang-vcs.eclass
@@ -109,13 +109,14 @@ _golang-vcs_fetch() {
 
                [[ -n ${EVCS_UMASK} ]] && eumask_pop
        fi
-       set -- mkdir -p "${WORKDIR}/${P}/src/${EGO_PN%/...}"
+       local go_srcpath="${WORKDIR}/${P}/src/${EGO_PN%/...}"
+       set -- mkdir -p "${go_srcpath}"
        echo "$@"
-       "$@" || die "Unable to create ${WORKDIR}/${P}/src"
+       "$@" || die "Unable to create ${go_srcpath}"
        set -- cp -r    "${EGO_STORE_DIR}/src/${EGO_PN%/...}" \
-               "${WORKDIR}/${P}/src/${EGO_PN%/...}"
+               "${go_srcpath}/.."
        echo "$@"
-       "$@" || die "Unable to copy sources to ${WORKDIR}/${P}"
+       "$@" || die "Unable to copy sources to ${go_srcpath}"
        return 0
 }