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

Diff of /eclass/cvs.eclass

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

Revision 1.82 Revision 1.83
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.82 2013/06/18 04:31:44 ottxor Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.83 2013/09/28 16:22:29 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
200 DEPEND+=" net-misc/openssh" 200 DEPEND+=" net-misc/openssh"
201fi 201fi
202 202
203# called from cvs_src_unpack 203# called from cvs_src_unpack
204cvs_fetch() { 204cvs_fetch() {
205 has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
205 206
206 # Make these options local variables so that the global values are 207 # Make these options local variables so that the global values are
207 # not affected by modifications in this function. 208 # not affected by modifications in this function.
208 209
209 local ECVS_COMMAND=${ECVS_COMMAND} 210 local ECVS_COMMAND=${ECVS_COMMAND}
390 if [[ ${CVS_RSH} == "ssh" ]] ; then 391 if [[ ${CVS_RSH} == "ssh" ]] ; then
391 # Force SSH to use SSH_ASKPASS by creating python wrapper 392 # Force SSH to use SSH_ASKPASS by creating python wrapper
392 393
393 export CVS_RSH="${T}/cvs_sshwrapper" 394 export CVS_RSH="${T}/cvs_sshwrapper"
394 cat > "${CVS_RSH}"<<EOF 395 cat > "${CVS_RSH}"<<EOF
395#!/usr/bin/python 396#!${EPREFIX}/usr/bin/python
396import fcntl 397import fcntl
397import os 398import os
398import sys 399import sys
399try: 400try:
400 fd = os.open('/dev/tty', 2) 401 fd = os.open('/dev/tty', 2)
434 435
435 echo -n "newarglist.insert(1, '-oStrictHostKeyChecking=" \ 436 echo -n "newarglist.insert(1, '-oStrictHostKeyChecking=" \
436 >> "${CVS_RSH}" 437 >> "${CVS_RSH}"
437 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \ 438 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \
438 >> "${CVS_RSH}" 439 >> "${CVS_RSH}"
439 echo "os.execv('/usr/bin/ssh', newarglist)" \ 440 echo "os.execv('${EPREFIX}/usr/bin/ssh', newarglist)" \
440 >> "${CVS_RSH}" 441 >> "${CVS_RSH}"
441 442
442 chmod a+x "${CVS_RSH}" 443 chmod a+x "${CVS_RSH}"
443 444
444 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS 445 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS

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

  ViewVC Help
Powered by ViewVC 1.1.20