diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-13 09:51:53 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-13 09:51:53 +0000 |
| commit | 3cd58021b4034eb5ec3db38fe60a7be8c194543f (patch) | |
| tree | b9e54127f397e67be6a46a675f3dae274d8647bd /eclass | |
| parent | Update documentation wrt 2009 additions (diff) | |
| download | gentoo-2-3cd58021b4034eb5ec3db38fe60a7be8c194543f.tar.gz gentoo-2-3cd58021b4034eb5ec3db38fe60a7be8c194543f.tar.bz2 gentoo-2-3cd58021b4034eb5ec3db38fe60a7be8c194543f.zip | |
Use bash 3.2 features.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/base.eclass | 4 | ||||
| -rw-r--r-- | eclass/git.eclass | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/eclass/base.eclass b/eclass/base.eclass index 76ea0cac0a74..3899c615fa62 100644 --- a/eclass/base.eclass +++ b/eclass/base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.43 2010/01/13 01:58:53 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.44 2010/01/13 09:51:53 scarabeus Exp $ # @ECLASS: base.eclass # @MAINTAINER: @@ -16,7 +16,7 @@ inherit eutils BASE_EXPF="src_unpack src_compile src_install" case "${EAPI:-0}" in - 2|3|4) BASE_EXPF="${BASE_EXPF} src_prepare src_configure" ;; + 2|3|4) BASE_EXPF+=" src_prepare src_configure" ;; *) ;; esac diff --git a/eclass/git.eclass b/eclass/git.eclass index a6abf8a2a0c6..59375b6ec058 100644 --- a/eclass/git.eclass +++ b/eclass/git.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.33 2009/12/29 17:18:16 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.34 2010/01/13 09:51:53 scarabeus Exp $ # @ECLASS: git.eclass # @MAINTAINER: @@ -52,7 +52,7 @@ DEPEND=">=dev-util/git-1.6" # @ECLASS-VARIABLE: EGIT_UPDATE_CMD # @DESCRIPTION: # Git fetch command. -EGIT_UPDATE_CMD="git pull -f -u" +EGIT_UPDATE_CMD="git pull -f -u --all" # @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD # @DESCRIPTION: @@ -299,12 +299,14 @@ git_fetch() { [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] && elog " commit: ${EGIT_COMMIT}" ${elogcmd} " branch: ${EGIT_BRANCH}" - ${elogcmd} " storage directory: \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\"" + ${elogcmd} " storage directory: \"${GIT_DIR}\"" - # unpack to the ${S} popd &> /dev/null - debug-print "cp -aR \"${GIT_DIR}\" \"${S}\"" - git clone "${GIT_DIR}" "${S}" + + # unpack to the ${S} + # "${EGIT_REPO_URI}" + debug-print "git clone -l -s -n \"${GIT_DIR}\" \"${S}\"" + git clone -l -s -n "${GIT_DIR}" "${S}" # set correct branch and the tree ebuild specified pushd "${S}" > /dev/null @@ -315,6 +317,7 @@ git_fetch() { fi debug-print "git checkout -b ${branchname} ${src}" git checkout -b ${branchname} ${src} 2>&1 > /dev/null + git_sumbodules popd > /dev/null |