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

Diff of /eclass/cvs.eclass

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

Revision 1.16 Revision 1.61
1# Copyright 1999-2000 Gentoo Technologies, Inc. 1# Copyright 1999-2004 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License, v2 or later 2# Distributed under the terms of the GNU General Public License v2
3# Author Dan Armak <danarmak@gentoo.org>
4# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.16 2002/09/08 21:23:03 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.61 2005/09/21 23:22:56 vapier Exp $
4
5inherit eutils
6
5# This eclass provides the generic cvs fetching functions. 7# This eclass provides the generic cvs fetching functions. To use
8# this from an ebuild, set the `ebuild-configurable settings' as
9# specified below in your ebuild before inheriting. Then either leave
10# the default src_unpack or extend over cvs_src_unpack. If you find
11# that you need to call the cvs_* functions directly, I'd be
12# interested to hear about it.
6 13
7ECLASS=cvs 14# TODO:
8INHERITED="$INHERITED $ECLASS"
9 15
16# Implement more auth types (gserver?, kserver?)
17
18# Support additional remote shells with `ext' authentication (does
19# anyone actually need to use it with anything other than SSH?)
20
21
22
10# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass 23# Users shouldn't change these settings! The ebuild/eclass inheriting
11# will take care of that. If you want to set the global KDE cvs ebuilds' settings, 24# this eclass will take care of that. If you want to set the global
12# see the comments in kde-source.eclass. 25# KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
13 26
14# --- begin ebuild-configurable settings 27# --- begin ebuild-configurable settings
15 28
29# ECVS_CVS_COMMAND -- CVS command to run
30#
16# cvs command to run. you can set fex. "cvs -t" for extensive debug information 31# You can set, for example, "cvs -t" for extensive debug information
17# on the cvs onnection. the default of "cvs -q -f -z4" means to be quiet, to disregard 32# on the cvs connection. The default of "cvs -q -f -z4" means to be
18# the ~/.cvsrc config file and to use maximum compression. 33# quiet, to disregard the ~/.cvsrc config file and to use maximum
34# compression.
35
19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 36[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
20 37
21# cvs options given after the command (i.e. cvs update foo) 38
39# ECVS_UP_OPTS, ECVS_CO_OPTS -- CVS options given after the cvs
40# command (update or checkout).
41#
22# don't remove -dP or things won't work 42# Don't remove -dP from update or things won't work.
43
44[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP"
23[ -z "$ECVS_CVS_OPTIONS" ] && ECVS_CVS_OPTIONS="-dP" 45[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
24 46
25# set this for the module/subdir to be fetched non-recursively
26#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
27 47
28# Where the cvs modules are stored/accessed 48# ECVS_LOCAL -- If this is set, the CVS module will be fetched
49# non-recursively. Refer to the information in the CVS man page
50# regarding the -l command option (not the -l global option).
51
52
53# ECVS_LOCALNAME -- local name of checkout directory
54#
55# This is useful if the module on the server is called something
56# common like 'driver' or is nested deep in a tree, and you don't like
57# useless empty directories.
58#
59# WARNING: Set this only from within ebuilds! If set in your shell or
60# some such, things will break because the ebuild won't expect it and
61# have e.g. a wrong $S setting.
62
63
64# ECVS_TOP_DIR -- The directory under which CVS modules are checked
65# out.
66
29[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src" 67[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
30 68
31# Name of cvs server, set to "offline" to disable fetching 69# ECVS_SERVER -- CVS path
32# (i.e. to assume module is checked out already and don't update it). 70#
33# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other 71# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde".
34# parts of the full CVSROOT (which looks like 72# Remove the other parts of the full CVSROOT, which might look like
35# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 73# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated
36# other settings 74# using other settings also.
75#
76# Set this to "offline" to disable fetching (i.e. to assume the module
77# is already checked out in ECVS_TOP_DIR).
78
37[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 79[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
38 80
39# Username to use 81
82# ECVS_MODULE -- the name of the CVS module to be fetched
83#
84# This must be set when cvs_src_unpack is called. This can include
85# several directory levels, i.e. "foo/bar/baz"
86
87#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
88
89
90# ECVS_BRANCH -- the name of the branch/tag to use
91
92# The default is "HEAD". The following default _will_ reset your
93# branch checkout to head if used.
94
95#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
96
97
98# ECVS_AUTH -- authentication method to use
99#
100# Possible values are "pserver" and "ext". If `ext' authentication is
101# used, the remote shell to use can be specified in CVS_RSH (SSH is
102# used by default). Currently, the only supported remote shell for
103# `ext' authentication is SSH.
104#
105# Armando Di Cianno <fafhrd@gentoo.org> 2004/09/27
106# - Added "no" as a server type, which uses no AUTH method, nor
107# does it login
108# e.g.
109# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System"
110# ( from gnustep-apps/textedit )
111[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
112
113# ECVS_USER -- Username to use for authentication on the remote server
40[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 114[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
41 115
42# Password to use (NOT (YET) SUPPORTED, because cvs doesn't store passwords in plaintext in .cvspass) 116
117# ECVS_PASS -- Password to use for authentication on the remote server
43[ -z "$ECVS_PASS" ] && ECVS_PASS="" 118[ -z "$ECVS_PASS" ] && ECVS_PASS=""
44 119
45# Module to be fetched, must be set explicitly -
46# I don't like the former ="$PN" default setting
47[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue"
48 120
49# Branch/tag to use, default is HEAD 121# ECVS_SSH_HOST_KEY
50# uncomment the following line to enable the reset-branch-to-HEAD behaviour 122#
51[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD" 123# If SSH is used for `ext' authentication, use this variable to
124# specify the host key of the remote server. The format of the value
125# should be the same format that is used for the SSH known hosts file.
126#
127# WARNING: If a SSH host key is not specified using this variable, the
128# remote host key will not be verified.
52 129
53# Subdirectory in module to be fetched, default is not defined = whole module 130
54# DO NOT set default to "", if it's defined at all code will break! 131# ECVS_CLEAN -- Set this to get a clean copy when updating (passes the
55# don't uncomment following line! 132# -C option to cvs update)
56#[ -z "$ECVS_MODULE_SUBDIR" ] && ECVS_MODULE_SUBDIR="" 133
134
135# ECVS_RUNAS
136#
137# Specifies an alternate (non-root) user to use to run cvs. Currently
138# b0rked and wouldn't work with portage userpriv anyway without
139# special magic.
140
141# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
142
143
144# ECVS_SUBDIR -- deprecated, do not use
145[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
146
57 147
58# --- end ebuild-configurable settings --- 148# --- end ebuild-configurable settings ---
59 149
60# add cvs to deps 150# add cvs to deps
151# ssh is used for ext auth
152# sudo is used to run as a specified user
61DEPEND="$DEPEND dev-util/cvs" 153DEPEND="dev-util/cvs"
62 154
63# since we now longer have src_fetch as a redefinable ebuild function, 155[ -n "$ECVS_RUNAS" ] && DEPEND="$DEPEND app-admin/sudo"
64# we are forced to call this function from cvs_src_unpack 156
157if [ "$ECVS_AUTH" == "ext" ]; then
158 #default to ssh
159 [ -z "$CVS_RSH" ] && export CVS_RSH="ssh"
160 if [ "$CVS_RSH" != "ssh" ]; then
161 die "Support for ext auth with clients other than ssh has not been implemented yet"
162 fi
163 DEPEND="${DEPEND} net-misc/openssh"
164fi
165
166# called from cvs_src_unpack
65cvs_fetch() { 167cvs_fetch() {
66 168
169 # Make these options local variables so that the global values are
170 # not affected by modifications in this function.
171
172 local ECVS_COMMAND="${ECVS_COMMAND}"
173 local ECVS_UP_OPTS="${ECVS_UP_OPTS}"
174 local ECVS_CO_OPTS="${ECVS_CO_OPTS}"
175
176 # Fix for sourceforge which doesnt want -z>3 anymore.
177
178 (echo $ECVS_SERVER | grep -q sourceforge) \
179 && [ "$ECVS_CVS_COMMAND" == "cvs -q -f -z4" ] \
180 && ECVS_CVS_COMMAND="cvs -q -f -z3"
181
67 debug-print-function $FUNCNAME $* 182 debug-print-function $FUNCNAME $*
68 183
69 debug-print "$FUNCNAME: init: 184 # Update variables that are modified by ebuild parameters, which
70ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 185 # should be effective every time cvs_fetch is called, and not just
71ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 186 # every time cvs.eclass is inherited
72ECVS_TOP_DIR=$ECVS_TOP_DIR
73ECVS_SERVER=$ECVS_SERVER
74ECVS_USER=$ECVS_USER
75ECVS_PASS=$ECVS_PASS
76ECS_MODULE=$ECVS_MODULE
77ECVS_MODULE_SUBDIR=$ECVS_SUBDIR
78ECVS_LOCAL=$ECVS_LOCAL
79DIR=$DIR"
80 187
81 # if ECVS_TOP_DIR is a symlink to a dir, get the real dir's path, 188 # Handle parameter for local (non-recursive) fetching
82 # otherwise addwrite() doesn't work 189
83 if [ -n "$ECVS_TOP_DIR" ]; then 190 if [ -n "$ECVS_LOCAL" ]; then
84 # create $ECVS_TOP_DIR if missing 191 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
85 addwrite $ECVS_TOP_DIR 192 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
86 [ ! -d $ECVS_TOP_DIR -a ! -L $ECVS_TOP_DIR ] && mkdir -p $ECVS_TOP_DIR
87 cd -P $ECVS_TOP_DIR
88 ECVS_TOP_DIR="`pwd`"
89 cd $OLDPWD
90 fi 193 fi
91
92 # a shorthand
93 [ -n "$ECVS_SUBDIR" ] && DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" || \
94 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}"
95 194
96 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 195 # Handle ECVS_BRANCH option
97 196 #
98 addread $DIR 197 # Because CVS auto-switches branches, we just have to pass the
99 198 # correct -rBRANCH option when updating.
100 if [ "$ECVS_SERVER" == "offline" ]; then
101 # we're not required to fetch anything, the module already exists and shouldn't be updated
102 if [ -d "$DIR" ]; then
103 debug-print "$FUNCNAME: offline mode, exiting"
104 return 0
105 else
106 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting."
107 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
108 return 1
109 fi
110 fi
111 199
112 # disable the sandbox for this dir
113 # not just $DIR because we want to create moduletopdir/CVS too
114 addwrite $ECVS_TOP_DIR/$ECVS_MODULE
115
116 if [ ! -d "$DIR" ]; then
117 debug-print "$FUNCNAME: creating cvs directory $DIR"
118 einfo "Creating directory $DIR"
119 export SANDBOX_WRITE="$SANDBOX_WRITE:/foo:/"
120 mkdir -p /$DIR
121 export SANDBOX_WRITE=${SANDBOX_WRITE//:\/foo:\/}
122 fi
123
124 # prepare a cvspass file just for this session so that cvs thinks we're logged
125 # in at the cvs server. we don't want to mess with ~/.cvspass.
126 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass
127 export CVS_PASSFILE="${T}/cvspass"
128 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
129
130 # Note: cvs update and checkout commands are unified.
131 # we make sure a CVS/ dir exists in our module subdir with the right
132 # Root and Repository entries in it and cvs update.
133
134 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}"
135
136 # CVS/Repository files can't (I think) contain two concatenated slashes
137 if [ -n "$ECVS_SUBDIR" ]; then 200 if [ -n "$ECVS_BRANCH" ]; then
138 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 201 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
202 ECVS_CO_OPTS="$ECVS_CO_OPTS -r$ECVS_BRANCH"
203 fi
204
205 # Handle ECVS_LOCALNAME, which specifies the local directory name
206 # to use. Note that the -d command option is not equivalent to
207 # the global -d option.
208
209 if [ "$ECVS_LOCALNAME" != "$ECVS_MODULE" ]; then
210 ECVS_CO_OPTS="$ECVS_CO_OPTS -d $ECVS_LOCALNAME"
211 fi
212
213
214 if [ -n "$ECVS_CLEAN" ]; then
215 ECVS_UP_OPTS="$ECVS_UP_OPTS -C"
216 fi
217
218
219 # It would be easiest to always be in "run-as mode", logic-wise,
220 # if sudo didn't ask for a password even when sudo'ing to `whoami`.
221
222 if [ -z "$ECVS_RUNAS" ]; then
223 run=""
139 else 224 else
140 repository="${ECVS_MODULE}" 225 run="sudo -u $ECVS_RUNAS"
141 fi 226 fi
142
143 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
144 227
145 cd $DIR 228 # Create the top dir if needed
229
146 if [ ! -d "$DIR/CVS" ]; then 230 if [ ! -d "$ECVS_TOP_DIR" ]; then
147 # create a new CVS/ directory (checkout) 231
232 # Note that the addwrite statements in this block are only
233 # there to allow creating ECVS_TOP_DIR; we allow writing
234 # inside it separately.
235
236 # This is because it's simpler than trying to find out the
237 # parent path of the directory, which would need to be the
238 # real path and not a symlink for things to work (so we can't
239 # just remove the last path element in the string)
240
148 debug-print "$FUNCNAME: creating new cvs directory" 241 debug-print "$FUNCNAME: checkout mode. creating cvs directory"
149 242 addwrite /foobar
150 mkdir CVS 243 addwrite /
151 echo $newserver > CVS/Root 244 $run mkdir -p "/$ECVS_TOP_DIR"
152 echo $repository > CVS/Repository 245 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
153 touch CVS/Entries 246 fi
154 247
155 # if we're checking out a subdirectory only, create a CVS/ dir 248 # In case ECVS_TOP_DIR is a symlink to a dir, get the real path,
156 # in the module's top dir so that the user (and we) can cvs update 249 # otherwise addwrite() doesn't work.
157 # from there to get the full module. 250
251 cd -P "$ECVS_TOP_DIR" > /dev/null
252 ECVS_TOP_DIR="`/bin/pwd`"
253
254 # Disable the sandbox for this dir
255 addwrite "$ECVS_TOP_DIR"
256
257 # Chown the directory and all of its contents
258 if [ -n "$ECVS_RUNAS" ]; then
259 $run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR"
260 fi
261
262 # Determine the CVS command mode (checkout or update)
158 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then 263 if [ ! -d "$ECVS_TOP_DIR/$ECVS_LOCALNAME/CVS" ]; then
159 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir" 264 mode=checkout
160 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/
161 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository
162 fi
163
164 else 265 else
165 #update existing module 266 mode=update
166 debug-print "$FUNCNAME: updating existing module/subdir" 267 fi
167 268
269
270 # Our server string (i.e. CVSROOT) without the password so it can
271 # be put in Root
272 if [ "$ECVS_AUTH" == "no" ]
273 then
274 local server="${ECVS_USER}@${ECVS_SERVER}"
275 else
276 local server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
277 fi
278
168 # Switch servers if needed 279 # Switch servers automagically if needed
169 # cvs keeps the server info in the CVS/Root file in every checked-out dir; 280 if [ "$mode" == "update" ]; then
170 # we can fix those files to point to the new server 281 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
171 oldserver="`cat CVS/Root`" 282 local oldserver="`$run cat CVS/Root`"
172 if [ "$newserver" != "$oldserver" ]; then 283 if [ "$server" != "$oldserver" ]; then
173 284
174 einfo "Changing CVS server from $oldserver to $newserver:" 285 einfo "Changing the CVS server from $oldserver to $server:"
175 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:" 286 debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:"
176 287
177 einfo "Searching for CVS dirs..." 288 einfo "Searching for CVS directories ..."
178 cvsdirs="`find . -iname CVS -print`" 289 local cvsdirs="`$run find . -iname CVS -print`"
179 debug-print "$FUNCNAME: CVS dirs found:" 290 debug-print "$FUNCNAME: CVS directories found:"
180 debug-print "$cvsdirs" 291 debug-print "$cvsdirs"
181 292
182 einfo "Modifying CVS dirs..." 293 einfo "Modifying CVS directories ..."
183 for x in $cvsdirs; do 294 for x in $cvsdirs; do
184 debug-print "In $x" 295 debug-print "In $x"
185 echo $newserver > $x/Root 296 $run echo "$server" > "$x/Root"
186 done 297 done
187 298
188 fi 299 fi
300 fi
189 301
302 # Prepare a cvspass file just for this session, we don't want to
303 # mess with ~/.cvspass
304 touch "${T}/cvspass"
305 export CVS_PASSFILE="${T}/cvspass"
306 if [ -n "$ECVS_RUNAS" ]; then
307 chown "$ECVS_RUNAS" "${T}/cvspass"
308 fi
309
310 # The server string with the password in it, for login
311 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
312
313 # Ditto without the password, for checkout/update after login, so
314 # that the CVS/Root files don't contain the password in plaintext
315 if [ "$ECVS_AUTH" == "no" ]
316 then
317 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
318 else
319 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
320 fi
321
322 # Commands to run
323 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login"
324 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
325 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
326
327 # Execute commands
328
329 cd "${ECVS_TOP_DIR}"
330 if [ "${ECVS_AUTH}" == "pserver" ]; then
331 einfo "Running $cmdlogin"
332 eval $cmdlogin || die "cvs login command failed"
333 if [ "${mode}" == "update" ]; then
334 einfo "Running $cmdupdate"
335 eval $cmdupdate || die "cvs update command failed"
336 elif [ "${mode}" == "checkout" ]; then
337 einfo "Running $cmdcheckout"
338 eval $cmdcheckout|| die "cvs checkout command failed"
190 fi 339 fi
340 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then
191 341
192 # cvs auto-switches branches, how nice 342 # Hack to support SSH password authentication
193 # warning: if we do it this way we get multiple -rX options - harmless i think
194 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH"
195 343
196 # finally run the cvs update command 344 # Backup environment variable values
197 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR" 345 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}"
198 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..." 346
199 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update" 347 if [ "${SSH_ASKPASS+set}" == "set" ]; then
348 local CVS_ECLASS_ORIG_SSH_ASKPASS="${SSH_ASKPASS}"
349 else
350 unset CVS_ECLASS_ORIG_SSH_ASKPASS
351 fi
352
353 if [ "${DISPLAY+set}" == "set" ]; then
354 local CVS_ECLASS_ORIG_DISPLAY="${DISPLAY}"
355 else
356 unset CVS_ECLASS_ORIG_DISPLAY
357 fi
358
359 if [ "${CVS_RSH}" == "ssh" ]; then
360
361 # Force SSH to use SSH_ASKPASS by creating python wrapper
362
363 export CVS_RSH="${T}/cvs_sshwrapper"
364 cat > "${CVS_RSH}"<<EOF
365#!/usr/bin/python
366import fcntl
367import os
368import sys
369try:
370 fd = os.open('/dev/tty', 2)
371 TIOCNOTTY=0x5422
372 try:
373 fcntl.ioctl(fd, TIOCNOTTY)
374 except:
375 pass
376 os.close(fd)
377except:
378 pass
379newarglist = sys.argv[:]
380EOF
381
382 # disable X11 forwarding which causes .xauth access violations
383 # - 20041205 Armando Di Cianno <fafhrd@gentoo.org>
384 echo "newarglist.insert(1, '-oClearAllForwardings=yes')" \
385 >> "${CVS_RSH}"
386 echo "newarglist.insert(1, '-oForwardX11=no')" \
387 >> "${CVS_RSH}"
388
389 # Handle SSH host key checking
390
391 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts"
392 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \
393 >> "${CVS_RSH}"
394
395 if [ -z "${ECVS_SSH_HOST_KEY}" ]; then
396 ewarn "Warning: The SSH host key of the remote server will not be verified."
397 einfo "A temporary known hosts list will be used."
398 local CVS_ECLASS_STRICT_HOST_CHECKING="no"
399 touch "${CVS_ECLASS_KNOWN_HOSTS}"
400 else
401 local CVS_ECLASS_STRICT_HOST_CHECKING="yes"
402 echo "${ECVS_SSH_HOST_KEY}" > "${CVS_ECLASS_KNOWN_HOSTS}"
403 fi
404
405 echo -n "newarglist.insert(1, '-oStrictHostKeyChecking=" \
406 >> "${CVS_RSH}"
407 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \
408 >> "${CVS_RSH}"
409 echo "os.execv('/usr/bin/ssh', newarglist)" \
410 >> "${CVS_RSH}"
411
412 chmod a+x "${CVS_RSH}"
413
414 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
415 # if DISPLAY is not set)
416
417 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY"
418 export DISPLAY
419
420 # Create a dummy executable to echo $ECVS_PASS
421
422 export SSH_ASKPASS="${T}/cvs_sshechopass"
423 if [ "${ECVS_AUTH}" != "no" ]; then
424 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \
425 > "${SSH_ASKPASS}"
426 else
427 echo -en "#!/bin/bash\nreturn\n" \
428 > "${SSH_ASKPASS}"
429
430 fi
431 chmod a+x "${SSH_ASKPASS}"
432 fi
433
434 if [ "${mode}" == "update" ]; then
435 einfo "Running $cmdupdate"
436 eval $cmdupdate || die "cvs update command failed"
437 elif [ "${mode}" == "checkout" ]; then
438 einfo "Running $cmdcheckout"
439 eval $cmdcheckout|| die "cvs checkout command failed"
440 fi
441
442 # Restore environment variable values
443 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
444 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then
445 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}"
446 else
447 unset SSH_ASKPASS
448 fi
449
450 if [ "${CVS_ECLASS_ORIG_DISPLAY+set}" == "set" ]; then
451 export DISPLAY="${CVS_ECLASS_ORIG_DISPLAY}"
452 else
453 unset DISPLAY
454 fi
455 fi
456
457 # Restore ownership. Not sure why this is needed, but someone
458 # added it in the orig ECVS_RUNAS stuff.
459 if [ -n "$ECVS_RUNAS" ]; then
460 chown `whoami` "${T}/cvspass"
461 fi
200 462
201} 463}
202 464
465
203cvs_src_unpack() { 466cvs_src_unpack() {
204 467
205 debug-print-function $FUNCNAME $* 468 debug-print-function $FUNCNAME $*
206 cvs_fetch || die "died running cvs_fetch"
207 469
470 debug-print "$FUNCNAME: init:
471 ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
472 ECVS_UP_OPTS=$ECVS_UP_OPTS
473 ECVS_CO_OPTS=$ECVS_CO_OPTS
474 ECVS_TOP_DIR=$ECVS_TOP_DIR
475 ECVS_SERVER=$ECVS_SERVER
476 ECVS_USER=$ECVS_USER
477 ECVS_PASS=$ECVS_PASS
478 ECVS_MODULE=$ECVS_MODULE
479 ECVS_LOCAL=$ECVS_LOCAL
480 ECVS_RUNAS=$ECVS_RUNAS
481 ECVS_LOCALNAME=$ECVS_LOCALNAME"
482
483 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
484
485 local ECVS_LOCALNAME="${ECVS_LOCALNAME}"
486
487 if [ -z "$ECVS_LOCALNAME" ]; then
488 ECVS_LOCALNAME="$ECVS_MODULE"
489 fi
490
491 if [ "$ECVS_SERVER" == "offline" ]; then
492 # We're not required to fetch anything; the module already
493 # exists and shouldn't be updated.
494 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
495 debug-print "$FUNCNAME: offline mode"
496 else
497 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
498 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
499 fi
500 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
501 einfo "Fetching CVS module $ECVS_MODULE into $ECVS_TOP_DIR ..."
502 cvs_fetch
503 else # ECVS_SERVER not set
504 die "ERROR: CVS server not specified, cannot continue."
505 fi
506
208 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 507 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..."
209 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 508 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..."
210 509
510 # This is probably redundant, but best to make sure.
511 mkdir -p "$WORKDIR/$ECVS_LOCALNAME"
512
211 if [ -n "$ECVS_SUBDIR" ]; then 513 if [ -n "$ECVS_LOCAL" ]; then
212 mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR 514 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME"
213 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/
214 else 515 else
215 if [ -n "$ECVS_LOCAL" ]; then 516 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.."
216 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE
217 else
218 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR
219 fi 517 fi
220 fi 518
221
222 # if the directory is empty, remove it; empty directories cannot exist in cvs. 519 # If the directory is empty, remove it; empty directories cannot
223 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist. 520 # exist in cvs. This happens when, for example, kde-source
521 # requests module/doc/subdir which doesn't exist. Still create
224 # still create the empty directory in workdir though. 522 # the empty directory in workdir though.
225 if [ "`ls -A $DIR`" == "CVS" ]; then 523 if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_LOCALNAME}\"`" == "CVS" ]; then
226 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR" 524 debug-print "$FUNCNAME: removing empty CVS directory $ECVS_LOCALNAME"
227 rm -rf $DIR 525 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
228 fi 526 fi
229 527
230 # implement some of base_src_unpack's functionality; 528 # Implement some of base_src_unpack's functionality; note however
231 # note however that base.eclass may not have been inherited! 529 # that base.eclass may not have been inherited!
232 if [ -n "$PATCHES" ]; then 530 if [ -n "$PATCHES" ]; then
233 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 531 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
234 cd $S 532 cd "$S"
235 for x in $PATCHES; do 533 epatch ${PATCHES}
236 debug-print "patching from $x"
237 patch -p0 < $x
238 done
239 # make sure we don't try to apply patches more than once, since 534 # Make sure we don't try to apply patches more than once,
240 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack 535 # since cvs_src_unpack is usually called several times from
536 # e.g. kde-source_src_unpack
241 export PATCHES="" 537 export PATCHES=""
242 fi 538 fi
243 539
540 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
244} 541}
245 542
246EXPORT_FUNCTIONS src_unpack 543EXPORT_FUNCTIONS src_unpack
247
248

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.61

  ViewVC Help
Powered by ViewVC 1.1.20