From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A7E891381F3 for ; Fri, 6 Sep 2013 10:22:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 640D3E10B3; Fri, 6 Sep 2013 10:22:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9EA2E10B3 for ; Fri, 6 Sep 2013 10:22:08 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE34F33EBC7 for ; Fri, 6 Sep 2013 10:22:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 64D03E5469 for ; Fri, 6 Sep 2013 10:22:05 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1378462851.e24b74fa8ebecf2338d01b2acc824a7683c5a809.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: files/hooks/ X-VCS-Repository: proj/R_overlay X-VCS-Files: files/hooks/git-push.sh X-VCS-Directories: files/hooks/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: e24b74fa8ebecf2338d01b2acc824a7683c5a809 X-VCS-Branch: master Date: Fri, 6 Sep 2013 10:22:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 662bbb9a-dbcf-490c-ac19-598f872357f5 X-Archives-Hash: 68de810f3a488aaab1b32177eba00e4c commit: e24b74fa8ebecf2338d01b2acc824a7683c5a809 Author: André Erdmann mailerd de> AuthorDate: Fri Sep 6 10:20:51 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Fri Sep 6 10:20:51 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=e24b74fa git-push: return 0 even if git push failed + remove "echo" in the git push command --- files/hooks/git-push.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/files/hooks/git-push.sh b/files/hooks/git-push.sh index 2dbb73e..e65d861 100644 --- a/files/hooks/git-push.sh +++ b/files/hooks/git-push.sh @@ -24,7 +24,7 @@ $lf itertools # if errors occured. # git_push_to_remote() { - if run_command_logged echo ${GIT} push ${GIT_PUSH_ARGS-} "$@"; then + if run_command_logged ${GIT} push ${GIT_PUSH_ARGS-} "$@"; then veinfo "successfully pushed changes to ${1}" else __GIT_PUSH_SUCCESS=n @@ -55,15 +55,16 @@ git_push_to_remotes() { if [ "${__GIT_PUSH_SUCCESS}" = "y" ]; then return 0 else - return ${EX_GIT_PUSH_ERR} + # don't return non-zero due to "git push" errors + # this would cause roverlay to abort + #return ${EX_GIT_PUSH_ERR} + return 0 fi } ## main -if yesno "${NOSYNC?}"; then - einfo "sync is disabled - not pushing anything." -else +if sync_allowed "${this}"; then git_push_to_remotes fi