diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-07-11 18:38:59 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-07-11 18:38:59 +0000 |
| commit | 964bdd6c65fa9f386e283a509135ff6631ffffc5 (patch) | |
| tree | eda7af6ec98257103aaa24643878a48f4ac49198 /eclass | |
| parent | Version bump, mostly fixes rule-generator (diff) | |
| download | historical-964bdd6c65fa9f386e283a509135ff6631ffffc5.tar.gz historical-964bdd6c65fa9f386e283a509135ff6631ffffc5.tar.bz2 historical-964bdd6c65fa9f386e283a509135ff6631ffffc5.zip | |
New variable EBZR_UNPACK_DIR.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/bzr.eclass | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index e7541b8a21b4..a0fcb6d53171 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.877 2013/07/11 07:20:13 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.878 2013/07/11 18:38:59 ulm Exp $ + + 11 Jul 2013; Ulrich Müller <ulm@gentoo.org> bzr.eclass: + New variable EBZR_UNPACK_DIR. 11 Jul 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: Add a safety check for using python_optimize() in pkg_*. diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass index edee2d8f61c4..c3d33590e5b6 100644 --- a/eclass/bzr.eclass +++ b/eclass/bzr.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.19 2012/09/18 06:41:45 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.20 2013/07/11 18:38:59 ulm Exp $ # # @ECLASS: bzr.eclass # @MAINTAINER: @@ -41,6 +41,11 @@ esac # The directory to store all fetched Bazaar live sources. : ${EBZR_STORE_DIR:=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/bzr-src} +# @ECLASS-VARIABLE: EBZR_UNPACK_DIR +# @DESCRIPTION: +# The working directory where the sources are copied to. +: ${EBZR_UNPACK_DIR:=${WORKDIR}/${P}} + # @ECLASS-VARIABLE: EBZR_INIT_REPO_CMD # @DESCRIPTION: # The Bazaar command to initialise a shared repository. @@ -261,13 +266,14 @@ bzr_fetch() { if [[ -n ${EBZR_WORKDIR_CHECKOUT} ]]; then einfo "checking out ..." ${EBZR_CHECKOUT_CMD} ${EBZR_REVISION:+-r ${EBZR_REVISION}} \ - . "${WORKDIR}/${P}" || die "${EBZR}: checkout failed" + . "${EBZR_UNPACK_DIR}" || die "${EBZR}: checkout failed" else einfo "exporting ..." ${EBZR_EXPORT_CMD} ${EBZR_REVISION:+-r ${EBZR_REVISION}} \ - "${WORKDIR}/${P}" . || die "${EBZR}: export failed" + "${EBZR_UNPACK_DIR}" . || die "${EBZR}: export failed" fi - einfo "revision ${EBZR_REVISION:-${EBZR_REVNO}} is now in ${WORKDIR}/${P}" + einfo \ + "revision ${EBZR_REVISION:-${EBZR_REVNO}} is now in ${EBZR_UNPACK_DIR}" popd > /dev/null } |