[gentoo-commits] gentoo-x86 commit in eclass: cvs.eclass

[Mike Frysinger (vapier)]

vapier      10/08/21 18:21:06

  Modified:             cvs.eclass
  Log:
  support ESCM_OFFLINE #307743 by Martin Väth

Revision  Changes    Path
1.72                 eclass/cvs.eclass

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

Index: cvs.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- cvs.eclass	19 Jun 2010 00:35:11 -0000	1.71
+++ cvs.eclass	21 Aug 2010 18:21:06 -0000	1.72
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.71 2010/06/19 00:35:11 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.72 2010/08/21 18:21:06 vapier Exp $
 
 # @ECLASS: cvs.eclass
 # @MAINTAINER:
@@ -62,6 +62,12 @@
 # CVS options given after the cvs checkout command.
 [ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
 
+# @ECLASS-VARIABLE: ECVS_OFFLINE
+# @DESCRIPTION:
+# Set this variable to a non-empty value to disable the automatic updating of
+# a CVS source tree. This is intended to be set outside the cvs source
+# tree by users.
+: ${ECVS_OFFLINE:=${ESCM_OFFLINE}}
 
 # @ECLASS-VARIABLE: ECVS_LOCAL
 # @DESCRIPTION:
@@ -511,7 +517,7 @@
 
 	local sanitized_pn=$(echo "${PN}" | LC_ALL=C sed -e 's:[^A-Za-z0-9_]:_:g')
 	local offline_pkg_var="ECVS_OFFLINE_${sanitized_pn}"
-	if [ "${!offline_pkg_var}" == "1" -o "$ECVS_OFFLINE" == "1" -o "$ECVS_SERVER" == "offline" ]; then
+	if [[ -n ${!offline_pkg_var}${ECVS_OFFLINE} ]] || [[ "$ECVS_SERVER" == "offline" ]] ; then
 		# We're not required to fetch anything; the module already
 		# exists and shouldn't be updated.
 		if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then