/[gentoo-x86]/eclass/cvs.eclass
Gentoo

Diff of /eclass/cvs.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.81 Revision 1.82
1# Copyright 1999-2013 Gentoo Foundation 1# Copyright 1999-2013 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.81 2013/01/22 07:29:02 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.82 2013/06/18 04:31:44 ottxor Exp $
4 4
5# @ECLASS: cvs.eclass 5# @ECLASS: cvs.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# vapier@gentoo.org (and anyone who wants to help) 7# vapier@gentoo.org (and anyone who wants to help)
8# @BLURB: This eclass provides generic cvs fetching functions 8# @BLURB: This eclass provides generic cvs fetching functions
299 mode=update 299 mode=update
300 fi 300 fi
301 301
302 # Our server string (i.e. CVSROOT) without the password so it can 302 # Our server string (i.e. CVSROOT) without the password so it can
303 # be put in Root 303 # be put in Root
304 local connection="${ECVS_AUTH}"
304 if [[ ${ECVS_AUTH} == "no" ]] ; then 305 if [[ ${ECVS_AUTH} == "no" ]] ; then
305 local server="${ECVS_USER}@${ECVS_SERVER}" 306 local server="${ECVS_USER}@${ECVS_SERVER}"
306 else 307 else
307 local connection="${ECVS_AUTH}"
308 [[ -n ${ECVS_PROXY} ]] && connection+=";proxy=${ECVS_PROXY}" 308 [[ -n ${ECVS_PROXY} ]] && connection+=";proxy=${ECVS_PROXY}"
309 [[ -n ${ECVS_PROXY_PORT} ]] && connection+=";proxyport=${ECVS_PROXY_PORT}" 309 [[ -n ${ECVS_PROXY_PORT} ]] && connection+=";proxyport=${ECVS_PROXY_PORT}"
310 local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}" 310 local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
311 fi 311 fi
312 312
338 export CVS_PASSFILE="${T}/cvspass" 338 export CVS_PASSFILE="${T}/cvspass"
339 if [[ -n ${ECVS_RUNAS} ]] ; then 339 if [[ -n ${ECVS_RUNAS} ]] ; then
340 chown "${ECVS_RUNAS}" "${T}/cvspass" 340 chown "${ECVS_RUNAS}" "${T}/cvspass"
341 fi 341 fi
342 342
343 # The server string with the password in it, for login 343 # The server string with the password in it, for login (only used for pserver)
344 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}" 344 cvsroot_pass=":${connection}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
345 345
346 # Ditto without the password, for checkout/update after login, so 346 # Ditto without the password, for checkout/update after login, so
347 # that the CVS/Root files don't contain the password in plaintext 347 # that the CVS/Root files don't contain the password in plaintext
348 if [[ ${ECVS_AUTH} == "no" ]] ; then 348 if [[ ${ECVS_AUTH} == "no" ]] ; then
349 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}" 349 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
350 else 350 else
351 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 351 cvsroot_nopass=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
352 fi 352 fi
353 353
354 # Commands to run 354 # Commands to run
355 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login" 355 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login"
356 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}" 356 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"

Legend:
Removed from v.1.81  
changed lines
  Added in v.1.82

  ViewVC Help
Powered by ViewVC 1.1.20