Gentoo Archives: gentoo-commits

From: Tomas Chvatal <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Sun, 06 Feb 2011 15:38:06
Message-Id: 3facbf5a73a049881282d08f255d3ca1d0c6654a.scarabeus@gentoo
1 commit: 3facbf5a73a049881282d08f255d3ca1d0c6654a
2 Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 6 15:37:51 2011 +0000
4 Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 6 15:37:51 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3facbf5a
7
8 [eclasses] Fix wrong variable uage
9
10 ---
11 eclass/git-2.eclass | 4 ++--
12 1 files changed, 2 insertions(+), 2 deletions(-)
13
14 diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
15 index e5a0dc9..3e48770 100644
16 --- a/eclass/git-2.eclass
17 +++ b/eclass/git-2.eclass
18 @@ -239,7 +239,7 @@ git-2_prepare_storedir() {
19 git-2_move_source() {
20 debug-print-function ${FUNCNAME} "$@"
21
22 - if [[ -n ${ESCM_HAS_SUBMODULES} ]]; then
23 + if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
24 pushd "${EGIT_DIR}" &> /dev/null
25 debug-print "${FUNCNAME}: rsync -rlpgo . \"${EGIT_SOURCEDIR}\""
26 rsync -rlpgo . "${EGIT_SOURCEDIR}" || die "${FUNCNAME}: sync of git data to \"${EGIT_SOURCEDIR}\" failed"
27 @@ -299,7 +299,7 @@ git-2_fetch() {
28
29 oldsha1=$(git rev-parse ${upstream_branch})
30
31 - if [[ -n ${ESCM_HAS_SUBMODULES} ]]; then
32 + if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
33 debug-print "${ESCM_UPDATE_CMD} ${ESCM_OPTIONS}"
34 # fix branching
35 git checkout ${ESCM_MASTER}