diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2013-06-18 04:31:44 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2013-06-18 04:31:44 +0000 |
| commit | 4f591565169ae87008e4457b8d39558c22236f04 (patch) | |
| tree | e1e9b9188fc82fef1b518a4f3049714419dd5b59 /eclass | |
| parent | old (diff) | |
| download | historical-4f591565169ae87008e4457b8d39558c22236f04.tar.gz historical-4f591565169ae87008e4457b8d39558c22236f04.tar.bz2 historical-4f591565169ae87008e4457b8d39558c22236f04.zip | |
fixed use of proxy variables
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/cvs.eclass | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 406298146db1..aee14c8d7697 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.859 2013/06/17 19:13:17 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.860 2013/06/18 04:31:44 ottxor Exp $ + + 18 Jun 2013; Christoph Junghans <ottxor@gentoo.org> cvs.eclass: + fixed use of proxy variables 17 Jun 2013; Pacho Ramos <pacho@gentoo.org> multilib-minimal.eclass: Allow eapi4 (#473610) diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass index c06ac199cb99..3b60b585ba28 100644 --- a/eclass/cvs.eclass +++ b/eclass/cvs.eclass @@ -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/cvs.eclass,v 1.81 2013/01/22 07:29:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.82 2013/06/18 04:31:44 ottxor Exp $ # @ECLASS: cvs.eclass # @MAINTAINER: @@ -301,10 +301,10 @@ cvs_fetch() { # Our server string (i.e. CVSROOT) without the password so it can # be put in Root + local connection="${ECVS_AUTH}" if [[ ${ECVS_AUTH} == "no" ]] ; then local server="${ECVS_USER}@${ECVS_SERVER}" else - local connection="${ECVS_AUTH}" [[ -n ${ECVS_PROXY} ]] && connection+=";proxy=${ECVS_PROXY}" [[ -n ${ECVS_PROXY_PORT} ]] && connection+=";proxyport=${ECVS_PROXY_PORT}" local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}" @@ -340,15 +340,15 @@ cvs_fetch() { chown "${ECVS_RUNAS}" "${T}/cvspass" fi - # The server string with the password in it, for login - cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}" + # The server string with the password in it, for login (only used for pserver) + cvsroot_pass=":${connection}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}" # Ditto without the password, for checkout/update after login, so # that the CVS/Root files don't contain the password in plaintext if [[ ${ECVS_AUTH} == "no" ]] ; then cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}" else - cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" + cvsroot_nopass=":${connection}:${ECVS_USER}@${ECVS_SERVER}" fi # Commands to run |