diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-16 09:16:28 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-16 09:16:28 +0200 |
| commit | 54a861ae23d0382d6c3c618a012045f7b5b7c8d7 (patch) | |
| tree | 964b6aaa4917f233596fd2e72e11b8838e72ddc9 /eclass/git-2.eclass | |
| parent | b9f0958ed8679c0f7cc06425e2285d10ef54a4b9 (diff) | |
| download | kde-54a861ae23d0382d6c3c618a012045f7b5b7c8d7.tar.gz kde-54a861ae23d0382d6c3c618a012045f7b5b7c8d7.tar.bz2 kde-54a861ae23d0382d6c3c618a012045f7b5b7c8d7.zip | |
[git-2] Typo fixes + debug info
Diffstat (limited to 'eclass/git-2.eclass')
| -rw-r--r-- | 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 5f9cc0e439f..7c46b230c43 100644 --- a/eclass/git-2.eclass +++ b/eclass/git-2.eclass @@ -108,7 +108,6 @@ git-2_submodules() { return 1 fi - [[ $# -ne 1 ]] && die "${FUNCNAME}: requires exactly 1 argument (path)" debug-print "${FUNCNAME}: working in \"${1}\"" @@ -283,9 +282,9 @@ git-2_update_repo() { git-2_fetch() { debug-print-function ${FUNCNAME} "$@" - local oldsha cursha local type + local oldsha cursha repo_type - [[ -n ${EGIT_NONBARE} ]] && type="non-bare repository" || type="bare repository" + [[ -n ${EGIT_NONBARE} ]] && repo_type="non-bare repository" || repo_type="bare repository" 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}" } # @FUNCTION: git_bootstrap @@ -404,6 +402,7 @@ git-2_migrate_repository() { # to migrate the data if [[ -d ${EGIT_DIR} ]]; then if [[ ${target} == 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="${EGIT_DIR}.bare" @@ -415,6 +414,7 @@ git-2_migrate_repository() { eend ${returnstate} fi if [[ ${target} == 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=$? @@ -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 scratch." rm -rf "${EGIT_DIR}" |