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

Diff of /eclass/cvs.eclass

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

Revision 1.70 Revision 1.80
1# Copyright 1999-2008 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.70 2008/04/27 07:00:40 ulm Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.80 2013/01/22 07:26:25 vapier 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
11# ebuild, set the ECLASS VARIABLES as specified below in your ebuild before 11# ebuild, set the ECLASS VARIABLES as specified below in your ebuild before
12# inheriting. Then either leave the default src_unpack or extend over 12# inheriting. Then either leave the default src_unpack or extend over
13# cvs_src_unpack. If you find that you need to call the cvs_* functions 13# cvs_src_unpack. If you find that you need to call the cvs_* functions
14# directly, I'd be interested to hear about it. 14# directly, I'd be interested to hear about it.
15 15
16if [[ ${___ECLASS_ONCE_CVS} != "recur -_+^+_- spank" ]] ; then
17___ECLASS_ONCE_CVS="recur -_+^+_- spank"
18
16inherit eutils 19inherit eutils
17 20
18# TODO: 21# TODO:
19 22
20# Implement more auth types (gserver?, kserver?) 23# Implement more auth types (gserver?, kserver?)
24 27
25 28
26# Users shouldn't change these settings! The ebuild/eclass inheriting 29# Users shouldn't change these settings! The ebuild/eclass inheriting
27# this eclass will take care of that. If you want to set the global 30# this eclass will take care of that. If you want to set the global
28# KDE cvs ebuilds' settings, see the comments in kde-source.eclass. 31# KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
32
33# @ECLASS-VARIABLE: ECVS_CVS_COMPRESS
34# @DESCRIPTION:
35# Set the default compression level. Has no effect when ECVS_CVS_COMMAND
36# is defined by ebuild/user.
37: ${ECVS_CVS_COMPRESS:=-z1}
38
39# @ECLASS-VARIABLE: ECVS_CVS_OPTIONS
40# @DESCRIPTION:
41# Additional options to the cvs commands. Has no effect when ECVS_CVS_COMMAND
42# is defined by ebuild/user.
43: ${ECVS_CVS_OPTIONS:=-q -f}
29 44
30# @ECLASS-VARIABLE: ECVS_CVS_COMMAND 45# @ECLASS-VARIABLE: ECVS_CVS_COMMAND
31# @DESCRIPTION: 46# @DESCRIPTION:
32# CVS command to run 47# CVS command to run
33# 48#
34# You can set, for example, "cvs -t" for extensive debug information 49# You can set, for example, "cvs -t" for extensive debug information
35# on the cvs connection. The default of "cvs -q -f -z4" means to be 50# on the cvs connection. The default of "cvs -q -f -z4" means to be
36# quiet, to disregard the ~/.cvsrc config file and to use maximum 51# quiet, to disregard the ~/.cvsrc config file and to use maximum
37# compression. 52# compression.
38
39# @ECLASS-VARIABLE: ECVS_CVS_COMPRESS
40# @DESCRIPTION:
41# Set the compression level.
42[[ -z ${ECVS_CVS_COMPRESS} ]] && ECVS_CVS_COMPRESS="-z1"
43
44# @ECLASS-VARIABLE: ECVS_CVS_OPTIONS
45# @DESCRIPTION:
46# Additional options to the cvs commands.
47[[ -z ${ECVS_CVS_OPTIONS} ]] && ECVS_CVS_OPTIONS="-q -f"
48
49# @ECLASS-VARIABLE: ECVS_CVS_COMMAND
50# @DESCRIPTION:
51# The cvs command.
52[[ -z ${ECVS_CVS_COMMAND} ]] && ECVS_CVS_COMMAND="cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}" 53: ${ECVS_CVS_COMMAND:=cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}}
53 54
54# @ECLASS-VARIABLE: ECVS_UP_OPTS 55# @ECLASS-VARIABLE: ECVS_UP_OPTS
55# @DESCRIPTION: 56# @DESCRIPTION:
56# CVS options given after the cvs update command. Don't remove "-dP" or things 57# CVS options given after the cvs update command. Don't remove "-dP" or things
57# won't work. 58# won't work.
58[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP" 59: ${ECVS_UP_OPTS:=-dP}
59 60
60# @ECLASS-VARIABLE: ECVS_CO_OPTS 61# @ECLASS-VARIABLE: ECVS_CO_OPTS
62# @DEFAULT_UNSET
61# @DESCRIPTION: 63# @DESCRIPTION:
62# CVS options given after the cvs checkout command. 64# CVS options given after the cvs checkout command.
63[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
64 65
66# @ECLASS-VARIABLE: ECVS_OFFLINE
67# @DESCRIPTION:
68# Set this variable to a non-empty value to disable the automatic updating of
69# a CVS source tree. This is intended to be set outside the cvs source
70# tree by users.
71: ${ECVS_OFFLINE:=${EVCS_OFFLINE}}
65 72
66# @ECLASS-VARIABLE: ECVS_LOCAL 73# @ECLASS-VARIABLE: ECVS_LOCAL
74# @DEFAULT_UNSET
67# @DESCRIPTION: 75# @DESCRIPTION:
68# If this is set, the CVS module will be fetched non-recursively. 76# If this is set, the CVS module will be fetched non-recursively.
69# Refer to the information in the CVS man page regarding the -l 77# Refer to the information in the CVS man page regarding the -l
70# command option (not the -l global option). 78# command option (not the -l global option).
71 79
72# @ECLASS-VARIABLE: ECVS_LOCALNAME 80# @ECLASS-VARIABLE: ECVS_LOCALNAME
81# @DEFAULT_UNSET
73# @DESCRIPTION: 82# @DESCRIPTION:
74# Local name of checkout directory 83# Local name of checkout directory
75# 84#
76# This is useful if the module on the server is called something 85# This is useful if the module on the server is called something
77# common like 'driver' or is nested deep in a tree, and you don't like 86# common like 'driver' or is nested deep in a tree, and you don't like
82# have e.g. a wrong $S setting. 91# have e.g. a wrong $S setting.
83 92
84# @ECLASS-VARIABLE: ECVS_TOP_DIR 93# @ECLASS-VARIABLE: ECVS_TOP_DIR
85# @DESCRIPTION: 94# @DESCRIPTION:
86# The directory under which CVS modules are checked out. 95# The directory under which CVS modules are checked out.
87[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src" 96: ${ECVS_TOP_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src"}
88 97
89# @ECLASS-VARIABLE: ECVS_SERVER 98# @ECLASS-VARIABLE: ECVS_SERVER
90# @DESCRIPTION: 99# @DESCRIPTION:
91# CVS path 100# CVS path
92# 101#
95# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated 104# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated
96# using other settings also. 105# using other settings also.
97# 106#
98# Set this to "offline" to disable fetching (i.e. to assume the module 107# Set this to "offline" to disable fetching (i.e. to assume the module
99# is already checked out in ECVS_TOP_DIR). 108# is already checked out in ECVS_TOP_DIR).
100[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 109: ${ECVS_SERVER:="offline"}
101 110
102# @ECLASS-VARIABLE: ECVS_MODULE 111# @ECLASS-VARIABLE: ECVS_MODULE
112# @REQUIRED
103# @DESCRIPTION: 113# @DESCRIPTION:
104# The name of the CVS module to be fetched 114# The name of the CVS module to be fetched
105# 115#
106# This must be set when cvs_src_unpack is called. This can include 116# This must be set when cvs_src_unpack is called. This can include
107# several directory levels, i.e. "foo/bar/baz" 117# several directory levels, i.e. "foo/bar/baz"
108
109#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 118#[[ -z ${ECVS_MODULE} ]] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
110 119
111# @ECLASS-VARIABLE: ECVS_BRANCH 120# @ECLASS-VARIABLE: ECVS_BRANCH
121# @DEFAULT_UNSET
112# @DESCRIPTION: 122# @DESCRIPTION:
113# The name of the branch/tag to use 123# The name of the branch/tag to use
114# 124#
115# The default is "HEAD". The following default _will_ reset your 125# The default is "HEAD". The following default _will_ reset your
116# branch checkout to head if used. 126# branch checkout to head if used.
117 127#: ${ECVS_BRANCH:="HEAD"}
118#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
119 128
120# @ECLASS-VARIABLE: ECVS_AUTH 129# @ECLASS-VARIABLE: ECVS_AUTH
121# @DESCRIPTION: 130# @DESCRIPTION:
122# Authentication method to use 131# Authentication method to use
123# 132#
130# - Added "no" as a server type, which uses no AUTH method, nor 139# - Added "no" as a server type, which uses no AUTH method, nor
131# does it login 140# does it login
132# e.g. 141# e.g.
133# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System" 142# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System"
134# ( from gnustep-apps/textedit ) 143# ( from gnustep-apps/textedit )
135[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver" 144: ${ECVS_AUTH:="pserver"}
136 145
137# @ECLASS-VARIABLE: ECVS_USER 146# @ECLASS-VARIABLE: ECVS_USER
138# @DESCRIPTION: 147# @DESCRIPTION:
139# Username to use for authentication on the remote server. 148# Username to use for authentication on the remote server.
140[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 149: ${ECVS_USER:="anonymous"}
141 150
142# @ECLASS-VARIABLE: ECVS_PASS 151# @ECLASS-VARIABLE: ECVS_PASS
152# @DEFAULT_UNSET
143# @DESCRIPTION: 153# @DESCRIPTION:
144# Password to use for authentication on the remote server 154# Password to use for authentication on the remote server
145[ -z "$ECVS_PASS" ] && ECVS_PASS=""
146 155
147# @ECLASS-VARIABLE: ECVS_SSH_HOST_KEY 156# @ECLASS-VARIABLE: ECVS_SSH_HOST_KEY
157# @DEFAULT_UNSET
148# @DESCRIPTION: 158# @DESCRIPTION:
149# If SSH is used for `ext' authentication, use this variable to 159# If SSH is used for `ext' authentication, use this variable to
150# specify the host key of the remote server. The format of the value 160# specify the host key of the remote server. The format of the value
151# should be the same format that is used for the SSH known hosts file. 161# should be the same format that is used for the SSH known hosts file.
152# 162#
153# WARNING: If a SSH host key is not specified using this variable, the 163# WARNING: If a SSH host key is not specified using this variable, the
154# remote host key will not be verified. 164# remote host key will not be verified.
155 165
156# @ECLASS-VARIABLE: ECVS_CLEAN 166# @ECLASS-VARIABLE: ECVS_CLEAN
167# @DEFAULT_UNSET
157# @DESCRIPTION: 168# @DESCRIPTION:
158# Set this to get a clean copy when updating (passes the 169# Set this to get a clean copy when updating (passes the
159# -C option to cvs update) 170# -C option to cvs update)
160 171
161# @ECLASS-VARIABLE: ECVS_RUNAS 172# @ECLASS-VARIABLE: ECVS_RUNAS
173# @DEFAULT_UNSET
162# @DESCRIPTION: 174# @DESCRIPTION:
163# Specifies an alternate (non-root) user to use to run cvs. Currently 175# Specifies an alternate (non-root) user to use to run cvs. Currently
164# b0rked and wouldn't work with portage userpriv anyway without 176# b0rked and wouldn't work with portage userpriv anyway without
165# special magic. 177# special magic.
166 178
167# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`" 179# : ${ECVS_RUNAS:=$(whoami)}
168
169# ECVS_SUBDIR -- deprecated, do not use
170[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
171 180
172# add cvs to deps 181# add cvs to deps
173# ssh is used for ext auth 182# ssh is used for ext auth
174# sudo is used to run as a specified user 183# sudo is used to run as a specified user
175DEPEND="dev-util/cvs" 184DEPEND="dev-vcs/cvs"
176 185
177[ -n "$ECVS_RUNAS" ] && DEPEND="$DEPEND app-admin/sudo" 186[[ -n ${ECVS_RUNAS} ]] && DEPEND+=" app-admin/sudo"
178 187
179if [ "$ECVS_AUTH" == "ext" ]; then 188if [[ ${ECVS_AUTH} == "ext" ]] ; then
180 #default to ssh 189 #default to ssh
181 [ -z "$CVS_RSH" ] && export CVS_RSH="ssh" 190 [[ -z ${CVS_RSH} ]] && export CVS_RSH="ssh"
182 if [ "$CVS_RSH" != "ssh" ]; then 191 if [[ ${CVS_RSH} != "ssh" ]] ; then
183 die "Support for ext auth with clients other than ssh has not been implemented yet" 192 die "Support for ext auth with clients other than ssh has not been implemented yet"
184 fi 193 fi
185 DEPEND="${DEPEND} net-misc/openssh" 194 DEPEND+=" net-misc/openssh"
186fi 195fi
187 196
188# called from cvs_src_unpack 197# called from cvs_src_unpack
189cvs_fetch() { 198cvs_fetch() {
190 199
191 # Make these options local variables so that the global values are 200 # Make these options local variables so that the global values are
192 # not affected by modifications in this function. 201 # not affected by modifications in this function.
193 202
194 local ECVS_COMMAND="${ECVS_COMMAND}" 203 local ECVS_COMMAND=${ECVS_COMMAND}
195 local ECVS_UP_OPTS="${ECVS_UP_OPTS}" 204 local ECVS_UP_OPTS=${ECVS_UP_OPTS}
196 local ECVS_CO_OPTS="${ECVS_CO_OPTS}" 205 local ECVS_CO_OPTS=${ECVS_CO_OPTS}
197 206
198 debug-print-function $FUNCNAME $* 207 debug-print-function ${FUNCNAME} "$@"
199 208
200 # Update variables that are modified by ebuild parameters, which 209 # Update variables that are modified by ebuild parameters, which
201 # should be effective every time cvs_fetch is called, and not just 210 # should be effective every time cvs_fetch is called, and not just
202 # every time cvs.eclass is inherited 211 # every time cvs.eclass is inherited
203 212
204 # Handle parameter for local (non-recursive) fetching 213 # Handle parameter for local (non-recursive) fetching
205 214
206 if [ -n "$ECVS_LOCAL" ]; then 215 if [[ -n ${ECVS_LOCAL} ]] ; then
207 ECVS_UP_OPTS="$ECVS_UP_OPTS -l" 216 ECVS_UP_OPTS+=" -l"
208 ECVS_CO_OPTS="$ECVS_CO_OPTS -l" 217 ECVS_CO_OPTS+=" -l"
209 fi 218 fi
210 219
211 # Handle ECVS_BRANCH option 220 # Handle ECVS_BRANCH option
212 # 221 #
213 # Because CVS auto-switches branches, we just have to pass the 222 # Because CVS auto-switches branches, we just have to pass the
214 # correct -rBRANCH option when updating. 223 # correct -rBRANCH option when updating.
215 224
216 if [ -n "$ECVS_BRANCH" ]; then 225 if [[ -n ${ECVS_BRANCH} ]] ; then
217 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH" 226 ECVS_UP_OPTS+=" -r${ECVS_BRANCH}"
218 ECVS_CO_OPTS="$ECVS_CO_OPTS -r$ECVS_BRANCH" 227 ECVS_CO_OPTS+=" -r${ECVS_BRANCH}"
219 fi 228 fi
220 229
221 # Handle ECVS_LOCALNAME, which specifies the local directory name 230 # Handle ECVS_LOCALNAME, which specifies the local directory name
222 # to use. Note that the -d command option is not equivalent to 231 # to use. Note that the -d command option is not equivalent to
223 # the global -d option. 232 # the global -d option.
224 233
225 if [ "$ECVS_LOCALNAME" != "$ECVS_MODULE" ]; then 234 if [[ ${ECVS_LOCALNAME} != "${ECVS_MODULE}" ]] ; then
226 ECVS_CO_OPTS="$ECVS_CO_OPTS -d $ECVS_LOCALNAME" 235 ECVS_CO_OPTS+=" -d ${ECVS_LOCALNAME}"
227 fi 236 fi
228 237
229
230 if [ -n "$ECVS_CLEAN" ]; then 238 if [[ -n ${ECVS_CLEAN} ]] ; then
231 ECVS_UP_OPTS="$ECVS_UP_OPTS -C" 239 ECVS_UP_OPTS+=" -C"
232 fi 240 fi
233
234 241
235 # It would be easiest to always be in "run-as mode", logic-wise, 242 # It would be easiest to always be in "run-as mode", logic-wise,
236 # if sudo didn't ask for a password even when sudo'ing to `whoami`. 243 # if sudo didn't ask for a password even when sudo'ing to `whoami`.
237 244
238 if [ -z "$ECVS_RUNAS" ]; then 245 if [[ -z ${ECVS_RUNAS} ]] ; then
239 run="" 246 run=""
240 else 247 else
241 run="sudo -u $ECVS_RUNAS" 248 run="sudo -u ${ECVS_RUNAS}"
242 fi 249 fi
243 250
244 # Create the top dir if needed 251 # Create the top dir if needed
245 252
246 if [ ! -d "$ECVS_TOP_DIR" ]; then 253 if [[ ! -d ${ECVS_TOP_DIR} ]] ; then
247
248 # Note that the addwrite statements in this block are only 254 # Note that the addwrite statements in this block are only
249 # there to allow creating ECVS_TOP_DIR; we allow writing 255 # there to allow creating ECVS_TOP_DIR; we allow writing
250 # inside it separately. 256 # inside it separately.
251 257
252 # This is because it's simpler than trying to find out the 258 # This is because it's simpler than trying to find out the
253 # parent path of the directory, which would need to be the 259 # parent path of the directory, which would need to be the
254 # real path and not a symlink for things to work (so we can't 260 # real path and not a symlink for things to work (so we can't
255 # just remove the last path element in the string) 261 # just remove the last path element in the string)
256 262
257 debug-print "$FUNCNAME: checkout mode. creating cvs directory" 263 debug-print "${FUNCNAME}: checkout mode. creating cvs directory"
258 addwrite /foobar 264 addwrite /foobar
259 addwrite / 265 addwrite /
260 $run mkdir -p "/$ECVS_TOP_DIR" 266 ${run} mkdir -p "/${ECVS_TOP_DIR}"
261 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}" 267 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
262 fi 268 fi
263 269
264 # In case ECVS_TOP_DIR is a symlink to a dir, get the real path, 270 # In case ECVS_TOP_DIR is a symlink to a dir, get the real path,
265 # otherwise addwrite() doesn't work. 271 # otherwise addwrite() doesn't work.
266 272
267 cd -P "$ECVS_TOP_DIR" > /dev/null 273 cd -P "${ECVS_TOP_DIR}" >/dev/null
268 ECVS_TOP_DIR="`/bin/pwd`" 274 ECVS_TOP_DIR=$(pwd)
269 275
270 # Disable the sandbox for this dir 276 # Disable the sandbox for this dir
271 addwrite "$ECVS_TOP_DIR" 277 addwrite "${ECVS_TOP_DIR}"
272 278
273 # Chown the directory and all of its contents 279 # Chown the directory and all of its contents
274 if [ -n "$ECVS_RUNAS" ]; then 280 if [[ -n ${ECVS_RUNAS} ]] ; then
275 $run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR" 281 ${run} chown -R "${ECVS_RUNAS}" "/${ECVS_TOP_DIR}"
276 fi 282 fi
277 283
278 # Determine the CVS command mode (checkout or update) 284 # Determine the CVS command mode (checkout or update)
279 if [ ! -d "$ECVS_TOP_DIR/$ECVS_LOCALNAME/CVS" ]; then 285 if [[ ! -d ${ECVS_TOP_DIR}/${ECVS_LOCALNAME}/CVS ]] ; then
280 mode=checkout 286 mode=checkout
281 else 287 else
282 mode=update 288 mode=update
283 fi 289 fi
284 290
285
286 # Our server string (i.e. CVSROOT) without the password so it can 291 # Our server string (i.e. CVSROOT) without the password so it can
287 # be put in Root 292 # be put in Root
288 if [ "$ECVS_AUTH" == "no" ] 293 if [[ ${ECVS_AUTH} == "no" ]] ; then
289 then
290 local server="${ECVS_USER}@${ECVS_SERVER}" 294 local server="${ECVS_USER}@${ECVS_SERVER}"
291 else 295 else
292 local connection="${ECVS_AUTH}" 296 local connection="${ECVS_AUTH}"
293 [[ -n ${ECVS_PROXY} ]] && connection="${connection};proxy=${ECVS_PROXY}" 297 [[ -n ${ECVS_PROXY} ]] && connection+=";proxy=${ECVS_PROXY}"
294 [[ -n ${ECVS_PROXY_PORT} ]] && connection="${connection};proxyport=${ECVS_PROXY_PORT}" 298 [[ -n ${ECVS_PROXY_PORT} ]] && connection+=";proxyport=${ECVS_PROXY_PORT}"
295 local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}" 299 local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
296 fi 300 fi
297 301
298 # Switch servers automagically if needed 302 # Switch servers automagically if needed
299 if [ "$mode" == "update" ]; then 303 if [[ ${mode} == "update" ]] ; then
300 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME 304 cd "/${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
301 local oldserver="`$run cat CVS/Root`" 305 local oldserver=$(${run} cat CVS/Root)
302 if [ "$server" != "$oldserver" ]; then 306 if [[ ${server} != "${oldserver}" ]] ; then
303
304 einfo "Changing the CVS server from $oldserver to $server:" 307 einfo "Changing the CVS server from ${oldserver} to ${server}:"
305 debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:" 308 debug-print "${FUNCNAME}: Changing the CVS server from ${oldserver} to ${server}:"
306 309
307 einfo "Searching for CVS directories ..." 310 einfo "Searching for CVS directories ..."
308 local cvsdirs="`$run find . -iname CVS -print`" 311 local cvsdirs=$(${run} find . -iname CVS -print)
309 debug-print "$FUNCNAME: CVS directories found:" 312 debug-print "${FUNCNAME}: CVS directories found:"
310 debug-print "$cvsdirs" 313 debug-print "${cvsdirs}"
311 314
312 einfo "Modifying CVS directories ..." 315 einfo "Modifying CVS directories ..."
316 local x
313 for x in $cvsdirs; do 317 for x in ${cvsdirs} ; do
314 debug-print "In $x" 318 debug-print "In ${x}"
315 $run echo "$server" > "$x/Root" 319 ${run} echo "${server}" > "${x}/Root"
316 done 320 done
317
318 fi 321 fi
319 fi 322 fi
320 323
321 # Prepare a cvspass file just for this session, we don't want to 324 # Prepare a cvspass file just for this session, we don't want to
322 # mess with ~/.cvspass 325 # mess with ~/.cvspass
323 touch "${T}/cvspass" 326 touch "${T}/cvspass"
324 export CVS_PASSFILE="${T}/cvspass" 327 export CVS_PASSFILE="${T}/cvspass"
325 if [ -n "$ECVS_RUNAS" ]; then 328 if [[ -n ${ECVS_RUNAS} ]] ; then
326 chown "$ECVS_RUNAS" "${T}/cvspass" 329 chown "${ECVS_RUNAS}" "${T}/cvspass"
327 fi 330 fi
328 331
329 # The server string with the password in it, for login 332 # The server string with the password in it, for login
330 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}" 333 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
331 334
332 # Ditto without the password, for checkout/update after login, so 335 # Ditto without the password, for checkout/update after login, so
333 # that the CVS/Root files don't contain the password in plaintext 336 # that the CVS/Root files don't contain the password in plaintext
334 if [ "$ECVS_AUTH" == "no" ] 337 if [[ ${ECVS_AUTH} == "no" ]] ; then
335 then
336 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}" 338 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
337 else 339 else
338 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 340 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
339 fi 341 fi
340 342
344 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}" 346 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
345 347
346 # Execute commands 348 # Execute commands
347 349
348 cd "${ECVS_TOP_DIR}" 350 cd "${ECVS_TOP_DIR}"
349 if [ "${ECVS_AUTH}" == "pserver" ]; then 351 if [[ ${ECVS_AUTH} == "pserver" ]] ; then
350 einfo "Running $cmdlogin" 352 einfo "Running ${cmdlogin}"
351 eval $cmdlogin || die "cvs login command failed" 353 eval ${cmdlogin} || die "cvs login command failed"
352 if [ "${mode}" == "update" ]; then 354 if [[ ${mode} == "update" ]] ; then
353 einfo "Running $cmdupdate" 355 einfo "Running ${cmdupdate}"
354 eval $cmdupdate || die "cvs update command failed" 356 eval ${cmdupdate} || die "cvs update command failed"
355 elif [ "${mode}" == "checkout" ]; then 357 elif [[ ${mode} == "checkout" ]] ; then
356 einfo "Running $cmdcheckout" 358 einfo "Running ${cmdcheckout}"
357 eval $cmdcheckout|| die "cvs checkout command failed" 359 eval ${cmdcheckout} || die "cvs checkout command failed"
358 fi 360 fi
359 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then 361 elif [[ ${ECVS_AUTH} == "ext" || ${ECVS_AUTH} == "no" ]] ; then
360
361 # Hack to support SSH password authentication 362 # Hack to support SSH password authentication
362 363
363 # Backup environment variable values 364 # Backup environment variable values
364 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}" 365 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}"
365 366
366 if [ "${SSH_ASKPASS+set}" == "set" ]; then 367 if [[ ${SSH_ASKPASS+set} == "set" ]] ; then
367 local CVS_ECLASS_ORIG_SSH_ASKPASS="${SSH_ASKPASS}" 368 local CVS_ECLASS_ORIG_SSH_ASKPASS="${SSH_ASKPASS}"
368 else 369 else
369 unset CVS_ECLASS_ORIG_SSH_ASKPASS 370 unset CVS_ECLASS_ORIG_SSH_ASKPASS
370 fi 371 fi
371 372
372 if [ "${DISPLAY+set}" == "set" ]; then 373 if [[ ${DISPLAY+set} == "set" ]] ; then
373 local CVS_ECLASS_ORIG_DISPLAY="${DISPLAY}" 374 local CVS_ECLASS_ORIG_DISPLAY="${DISPLAY}"
374 else 375 else
375 unset CVS_ECLASS_ORIG_DISPLAY 376 unset CVS_ECLASS_ORIG_DISPLAY
376 fi 377 fi
377 378
378 if [ "${CVS_RSH}" == "ssh" ]; then 379 if [[ ${CVS_RSH} == "ssh" ]] ; then
379
380 # Force SSH to use SSH_ASKPASS by creating python wrapper 380 # Force SSH to use SSH_ASKPASS by creating python wrapper
381 381
382 export CVS_RSH="${T}/cvs_sshwrapper" 382 export CVS_RSH="${T}/cvs_sshwrapper"
383 cat > "${CVS_RSH}"<<EOF 383 cat > "${CVS_RSH}"<<EOF
384#!/usr/bin/python 384#!/usr/bin/python
409 409
410 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts" 410 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts"
411 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \ 411 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \
412 >> "${CVS_RSH}" 412 >> "${CVS_RSH}"
413 413
414 if [ -z "${ECVS_SSH_HOST_KEY}" ]; then 414 if [[ -z ${ECVS_SSH_HOST_KEY} ]] ; then
415 ewarn "Warning: The SSH host key of the remote server will not be verified." 415 ewarn "Warning: The SSH host key of the remote server will not be verified."
416 einfo "A temporary known hosts list will be used." 416 einfo "A temporary known hosts list will be used."
417 local CVS_ECLASS_STRICT_HOST_CHECKING="no" 417 local CVS_ECLASS_STRICT_HOST_CHECKING="no"
418 touch "${CVS_ECLASS_KNOWN_HOSTS}" 418 touch "${CVS_ECLASS_KNOWN_HOSTS}"
419 else 419 else
431 chmod a+x "${CVS_RSH}" 431 chmod a+x "${CVS_RSH}"
432 432
433 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS 433 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
434 # if DISPLAY is not set) 434 # if DISPLAY is not set)
435 435
436 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY" 436 : ${DISPLAY:="DISPLAY"}
437 export DISPLAY 437 export DISPLAY
438 438
439 # Create a dummy executable to echo $ECVS_PASS 439 # Create a dummy executable to echo ${ECVS_PASS}
440 440
441 export SSH_ASKPASS="${T}/cvs_sshechopass" 441 export SSH_ASKPASS="${T}/cvs_sshechopass"
442 if [ "${ECVS_AUTH}" != "no" ]; then 442 if [[ ${ECVS_AUTH} != "no" ]] ; then
443 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \ 443 echo -en "#!/bin/bash\necho \"${ECVS_PASS}\"\n" \
444 > "${SSH_ASKPASS}" 444 > "${SSH_ASKPASS}"
445 else 445 else
446 echo -en "#!/bin/bash\nreturn\n" \ 446 echo -en "#!/bin/bash\nreturn\n" \
447 > "${SSH_ASKPASS}" 447 > "${SSH_ASKPASS}"
448
449 fi 448 fi
450 chmod a+x "${SSH_ASKPASS}" 449 chmod a+x "${SSH_ASKPASS}"
451 fi 450 fi
452 451
453 if [ "${mode}" == "update" ]; then 452 if [[ ${mode} == "update" ]] ; then
454 einfo "Running $cmdupdate" 453 einfo "Running ${cmdupdate}"
455 eval $cmdupdate || die "cvs update command failed" 454 eval ${cmdupdate} || die "cvs update command failed"
456 elif [ "${mode}" == "checkout" ]; then 455 elif [[ ${mode} == "checkout" ]] ; then
457 einfo "Running $cmdcheckout" 456 einfo "Running ${cmdcheckout}"
458 eval $cmdcheckout|| die "cvs checkout command failed" 457 eval ${cmdcheckout} || die "cvs checkout command failed"
459 fi 458 fi
460 459
461 # Restore environment variable values 460 # Restore environment variable values
462 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}" 461 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
463 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then 462 if [[ ${CVS_ECLASS_ORIG_SSH_ASKPASS+set} == "set" ]] ; then
464 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}" 463 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}"
465 else 464 else
466 unset SSH_ASKPASS 465 unset SSH_ASKPASS
467 fi 466 fi
468 467
469 if [ "${CVS_ECLASS_ORIG_DISPLAY+set}" == "set" ]; then 468 if [[ ${CVS_ECLASS_ORIG_DISPLAY+set} == "set" ]] ; then
470 export DISPLAY="${CVS_ECLASS_ORIG_DISPLAY}" 469 export DISPLAY="${CVS_ECLASS_ORIG_DISPLAY}"
471 else 470 else
472 unset DISPLAY 471 unset DISPLAY
473 fi 472 fi
474 fi 473 fi
475 474
476 # Restore ownership. Not sure why this is needed, but someone 475 # Restore ownership. Not sure why this is needed, but someone
477 # added it in the orig ECVS_RUNAS stuff. 476 # added it in the orig ECVS_RUNAS stuff.
478 if [ -n "$ECVS_RUNAS" ]; then 477 if [[ -n ${ECVS_RUNAS} ]] ; then
479 chown `whoami` "${T}/cvspass" 478 chown $(whoami) "${T}/cvspass"
480 fi 479 fi
481 480
482} 481}
483 482
484# @FUNCTION: cvs_src_unpack 483# @FUNCTION: cvs_src_unpack
485# @DESCRIPTION: 484# @DESCRIPTION:
486# The cvs src_unpack function, which will be exported 485# The cvs src_unpack function, which will be exported
487cvs_src_unpack() { 486cvs_src_unpack() {
488 487
489 debug-print-function $FUNCNAME $* 488 debug-print-function ${FUNCNAME} "$@"
490 489
491 debug-print "$FUNCNAME: init: 490 debug-print "${FUNCNAME}: init:
492 ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 491 ECVS_CVS_COMMAND=${ECVS_CVS_COMMAND}
493 ECVS_UP_OPTS=$ECVS_UP_OPTS 492 ECVS_UP_OPTS=${ECVS_UP_OPTS}
494 ECVS_CO_OPTS=$ECVS_CO_OPTS 493 ECVS_CO_OPTS=${ECVS_CO_OPTS}
495 ECVS_TOP_DIR=$ECVS_TOP_DIR 494 ECVS_TOP_DIR=${ECVS_TOP_DIR}
496 ECVS_SERVER=$ECVS_SERVER 495 ECVS_SERVER=${ECVS_SERVER}
497 ECVS_USER=$ECVS_USER 496 ECVS_USER=${ECVS_USER}
498 ECVS_PASS=$ECVS_PASS 497 ECVS_PASS=${ECVS_PASS}
499 ECVS_MODULE=$ECVS_MODULE 498 ECVS_MODULE=${ECVS_MODULE}
500 ECVS_LOCAL=$ECVS_LOCAL 499 ECVS_LOCAL=${ECVS_LOCAL}
501 ECVS_RUNAS=$ECVS_RUNAS 500 ECVS_RUNAS=${ECVS_RUNAS}
502 ECVS_LOCALNAME=$ECVS_LOCALNAME" 501 ECVS_LOCALNAME=${ECVS_LOCALNAME}"
503 502
504 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue." 503 [[ -z ${ECVS_MODULE} ]] && die "ERROR: CVS module not set, cannot continue."
505 504
506 local ECVS_LOCALNAME="${ECVS_LOCALNAME}" 505 local ECVS_LOCALNAME=${ECVS_LOCALNAME:-${ECVS_MODULE}}
507
508 if [ -z "$ECVS_LOCALNAME" ]; then
509 ECVS_LOCALNAME="$ECVS_MODULE"
510 fi
511 506
512 local sanitized_pn=$(echo "${PN}" | LC_ALL=C sed -e 's:[^A-Za-z0-9_]:_:g') 507 local sanitized_pn=$(echo "${PN}" | LC_ALL=C sed -e 's:[^A-Za-z0-9_]:_:g')
513 local offline_pkg_var="ECVS_OFFLINE_${sanitized_pn}" 508 local offline_pkg_var="ECVS_OFFLINE_${sanitized_pn}"
514 if [ "${!offline_pkg_var}" == "1" -o "$ECVS_OFFLINE" == "1" -o "$ECVS_SERVER" == "offline" ]; then 509 if [[ -n ${!offline_pkg_var}${ECVS_OFFLINE} ]] || [[ ${ECVS_SERVER} == "offline" ]] ; then
515 # We're not required to fetch anything; the module already 510 # We're not required to fetch anything; the module already
516 # exists and shouldn't be updated. 511 # exists and shouldn't be updated.
517 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then 512 if [[ -d ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} ]] ; then
518 debug-print "$FUNCNAME: offline mode" 513 debug-print "${FUNCNAME}: offline mode"
519 else 514 else
520 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error" 515 debug-print "${FUNCNAME}: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
521 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting." 516 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
522 fi 517 fi
523 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode 518 elif [[ -n ${ECVS_SERVER} ]] ; then # ECVS_SERVER!=offline --> real fetching mode
524 einfo "Fetching CVS module $ECVS_MODULE into $ECVS_TOP_DIR ..." 519 einfo "Fetching CVS module ${ECVS_MODULE} into ${ECVS_TOP_DIR} ..."
525 cvs_fetch 520 cvs_fetch
526 else # ECVS_SERVER not set 521 else # ECVS_SERVER not set
527 die "ERROR: CVS server not specified, cannot continue." 522 die "ERROR: CVS server not specified, cannot continue."
528 fi 523 fi
529 524
530 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..." 525 einfo "Copying ${ECVS_MODULE} from ${ECVS_TOP_DIR} ..."
531 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..." 526 debug-print "Copying module ${ECVS_MODULE} local_mode=${ECVS_LOCAL} from ${ECVS_TOP_DIR} ..."
532 527
533 # This is probably redundant, but best to make sure. 528 # This is probably redundant, but best to make sure.
534 mkdir -p "$WORKDIR/$ECVS_LOCALNAME" 529 mkdir -p "${WORKDIR}/${ECVS_LOCALNAME}"
535 530
536 if [ -n "$ECVS_LOCAL" ]; then 531 if [[ -n ${ECVS_LOCAL} ]] ; then
537 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME" 532 cp -f "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"/* "${WORKDIR}/${ECVS_LOCALNAME}"
538 else 533 else
539 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.." 534 cp -Rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" "${WORKDIR}/${ECVS_LOCALNAME}/.."
540 fi 535 fi
536
537 # Not exactly perfect, but should be pretty close #333773
538 export ECVS_VERSION=$(
539 find "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}/" -ipath '*/CVS/Entries' -exec cat {} + | \
540 LC_ALL=C sort | \
541 sha1sum | \
542 awk '{print $1}'
543 )
541 544
542 # If the directory is empty, remove it; empty directories cannot 545 # If the directory is empty, remove it; empty directories cannot
543 # exist in cvs. This happens when, for example, kde-source 546 # exist in cvs. This happens when, for example, kde-source
544 # requests module/doc/subdir which doesn't exist. Still create 547 # requests module/doc/subdir which doesn't exist. Still create
545 # the empty directory in workdir though. 548 # the empty directory in workdir though.
546 if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_LOCALNAME}\"`" == "CVS" ]; then 549 if [[ $(ls -A "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}") == "CVS" ]] ; then
547 debug-print "$FUNCNAME: removing empty CVS directory $ECVS_LOCALNAME" 550 debug-print "${FUNCNAME}: removing empty CVS directory ${ECVS_LOCALNAME}"
548 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" 551 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
549 fi 552 fi
550 553
551 # Implement some of base_src_unpack's functionality; note however 554 # Implement some of base_src_unpack's functionality; note however
552 # that base.eclass may not have been inherited! 555 # that base.eclass may not have been inherited!
553 if [ -n "$PATCHES" ]; then 556 if [[ -n ${PATCHES} ]] ; then
554 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 557 debug-print "${FUNCNAME}: PATCHES=${PATCHES,} S=${S}, autopatching"
555 cd "$S" 558 cd "${S}"
556 epatch ${PATCHES} 559 epatch ${PATCHES}
557 # Make sure we don't try to apply patches more than once, 560 # Make sure we don't try to apply patches more than once,
558 # since cvs_src_unpack is usually called several times from 561 # since cvs_src_unpack is usually called several times from
559 # e.g. kde-source_src_unpack 562 # e.g. kde-source_src_unpack
560 export PATCHES="" 563 export PATCHES=""
562 565
563 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}" 566 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
564} 567}
565 568
566EXPORT_FUNCTIONS src_unpack 569EXPORT_FUNCTIONS src_unpack
570
571fi

Legend:
Removed from v.1.70  
changed lines
  Added in v.1.80

  ViewVC Help
Powered by ViewVC 1.1.20