[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      13/09/13 15:04:36

  Modified:             ChangeLog git-r3.eclass
  Log:
  Do not leak EGIT_NONSHALLOW over loop iterations. Failing URL may cause non-shallow attempt to be made. When attempting next URL in the list, we should try shallow again.

Revision  Changes    Path
1.962                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.962&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.962&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.961&r2=1.962

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.961
retrieving revision 1.962
diff -u -r1.961 -r1.962
--- ChangeLog	13 Sep 2013 11:22:52 -0000	1.961
+++ ChangeLog	13 Sep 2013 15:04:36 -0000	1.962
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.961 2013/09/13 11:22:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.962 2013/09/13 15:04:36 mgorny Exp $
+
+  13 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
+  Do not leak EGIT_NONSHALLOW over loop iterations. Failing URL may cause
+  non-shallow attempt to be made. When attempting next URL in the list, we
+  should try shallow again.
 
   13 Sep 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
   Commit the version of einstalldocs() Council agreed upon.



1.4                  eclass/git-r3.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.3&r2=1.4

Index: git-r3.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git-r3.eclass	9 Sep 2013 16:01:17 -0000	1.3
+++ git-r3.eclass	13 Sep 2013 15:04:36 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.3 2013/09/09 16:01:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.4 2013/09/13 15:04:36 mgorny Exp $
 
 # @ECLASS: git-r3.eclass
 # @MAINTAINER:
@@ -401,9 +401,10 @@
 			$(git ls-remote "${r}" "${lookup_ref}")
 		)
 
+		local nonshallow=${EGIT_NONSHALLOW}
 		local ref_param=()
 		if [[ ! ${ref[0]} ]]; then
-			local EGIT_NONSHALLOW=1
+			nonshallow=1
 		fi
 
 		# 1. if we need a non-shallow clone and we have a shallow one,
@@ -418,7 +419,7 @@
 		#    if that looks beneficial.
 
 		local fetch_command=( git fetch )
-		if [[ ${EGIT_NONSHALLOW} ]]; then
+		if [[ ${nonshallow} ]]; then
 			if [[ -f ${GIT_DIR}/shallow ]]; then
 				ref_param+=( --unshallow )
 			fi