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 1QAzkM-0007ro-5T for garchives@archives.gentoo.org; Sat, 16 Apr 2011 07:16:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65C901C004; Sat, 16 Apr 2011 07:16:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2F2291C004 for ; Sat, 16 Apr 2011 07:16:38 +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 A15F21B40B7 for ; Sat, 16 Apr 2011 07:16:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BC8E680065 for ; Sat, 16 Apr 2011 07:16:36 +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: <54a861ae23d0382d6c3c618a012045f7b5b7c8d7.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: 54a861ae23d0382d6c3c618a012045f7b5b7c8d7 Date: Sat, 16 Apr 2011 07:16:36 +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: d3badbb01f499255a70865901403887b commit: 54a861ae23d0382d6c3c618a012045f7b5b7c8d7 Author: Tomas Chvatal gentoo org> AuthorDate: Sat Apr 16 07:16:28 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Sat Apr 16 07:16:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D54a861ae [git-2] Typo fixes + debug info --- eclass/git-2.eclass | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass index 5f9cc0e..7c46b23 100644 --- a/eclass/git-2.eclass +++ b/eclass/git-2.eclass @@ -108,7 +108,6 @@ git-2_submodules() { return 1 fi =20 - [[ $# -ne 1 ]] && die "${FUNCNAME}: requires exactly 1 argument (path)= " =20 debug-print "${FUNCNAME}: working in \"${1}\"" @@ -283,9 +282,9 @@ git-2_update_repo() { git-2_fetch() { debug-print-function ${FUNCNAME} "$@" =20 - local oldsha cursha local type + local oldsha cursha repo_type =20 - [[ -n ${EGIT_NONBARE} ]] && type=3D"non-bare repository" || type=3D"bar= e repository" + [[ -n ${EGIT_NONBARE} ]] && repo_type=3D"non-bare repository" || repo_t= ype=3D"bare repository" =20 if [[ ! -d ${EGIT_DIR} ]]; then git-2_initial_clone @@ -334,8 +333,7 @@ git-2_fetch() { && echo " commit: ${EGIT_COMMIT}" echo " branch: ${EGIT_BRANCH}" echo " storage directory: \"${EGIT_DIR}\"" - - echo " checkout type: ${type}" + echo " checkout type: ${repo_type}" } =20 # @FUNCTION: git_bootstrap @@ -404,6 +402,7 @@ git-2_migrate_repository() { # to migrate the data if [[ -d ${EGIT_DIR} ]]; then if [[ ${target} =3D=3D bare && -d ${EGIT_DIR}/.git ]]; then + debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy" ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy" mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare" export GIT_DIR=3D"${EGIT_DIR}.bare" @@ -415,6 +414,7 @@ git-2_migrate_repository() { eend ${returnstate} fi if [[ ${target} =3D=3D full && ! -d ${EGIT_DIR}/.git ]]; then + debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy= " ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy" git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null returnstate=3D$? @@ -424,6 +424,7 @@ git-2_migrate_repository() { fi fi if [[ ${returnstate} -ne 0 ]]; then + debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" failed, removing = to start from scratch" # migration failed, remove the EGIT_DIR to play it safe einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratc= h." rm -rf "${EGIT_DIR}"