From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pm6gg-0006Lv-Dr for garchives@archives.gentoo.org; Sun, 06 Feb 2011 15:38:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B640E0AF7; Sun, 6 Feb 2011 15:37:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E0B28E0AF7 for ; Sun, 6 Feb 2011 15:37:58 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 768071B408E for ; Sun, 6 Feb 2011 15:37:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DB7178006A for ; Sun, 6 Feb 2011 15:37:57 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <3facbf5a73a049881282d08f255d3ca1d0c6654a.scarabeus@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/git-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 3facbf5a73a049881282d08f255d3ca1d0c6654a Date: Sun, 6 Feb 2011 15:37:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 385204d0a5abf9b1aa366b35e85e24f7 commit: 3facbf5a73a049881282d08f255d3ca1d0c6654a Author: Tomas Chvatal gentoo org> AuthorDate: Sun Feb 6 15:37:51 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Sun Feb 6 15:37:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D3facbf5a [eclasses] Fix wrong variable uage --- eclass/git-2.eclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass index e5a0dc9..3e48770 100644 --- a/eclass/git-2.eclass +++ b/eclass/git-2.eclass @@ -239,7 +239,7 @@ git-2_prepare_storedir() { git-2_move_source() { debug-print-function ${FUNCNAME} "$@" =20 - if [[ -n ${ESCM_HAS_SUBMODULES} ]]; then + if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then pushd "${EGIT_DIR}" &> /dev/null debug-print "${FUNCNAME}: rsync -rlpgo . \"${EGIT_SOURCEDIR}\"" rsync -rlpgo . "${EGIT_SOURCEDIR}" || die "${FUNCNAME}: sync of git da= ta to \"${EGIT_SOURCEDIR}\" failed" @@ -299,7 +299,7 @@ git-2_fetch() { =20 oldsha1=3D$(git rev-parse ${upstream_branch}) =20 - if [[ -n ${ESCM_HAS_SUBMODULES} ]]; then + if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then debug-print "${ESCM_UPDATE_CMD} ${ESCM_OPTIONS}" # fix branching git checkout ${ESCM_MASTER}