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

Diff of /eclass/cvs.eclass

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

Revision 1.24 Revision 1.46
1# Copyright 1999-2000 Gentoo Technologies, Inc. 1# Copyright 1999-2003 Gentoo Technologies, Inc.
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.46 2003/08/07 02:58:18 vapier Exp $
4#
3# Author Dan Armak <danarmak@gentoo.org> 5# Author Dan Armak <danarmak@gentoo.org>
4# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.24 2002/11/19 12:54:22 phoenix Exp $ 6#
5# This eclass provides the generic cvs fetching functions. 7# This eclass provides the generic cvs fetching functions.
8# to use from an ebuild, set the 'ebuild-configurable settings' below in your ebuild before inheriting.
9# then either leave the default src_unpack or extend over cvs_src_unpack.
10# if you find that you need to call the cvs_* functions directly, i'd be interested to hear about it.
6 11
7ECLASS=cvs 12ECLASS=cvs
8INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
9 14
10# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass 15# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass
16# cvs command to run. you can set fex. "cvs -t" for extensive debug information 21# cvs command to run. you can set fex. "cvs -t" for extensive debug information
17# on the cvs onnection. the default of "cvs -q -f -z4" means to be quiet, to disregard 22# on the cvs onnection. the default of "cvs -q -f -z4" means to be quiet, to disregard
18# the ~/.cvsrc config file and to use maximum compression. 23# the ~/.cvsrc config file and to use maximum compression.
19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 24[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
20 25
21# cvs options given after the command (i.e. cvs update foo) 26# cvs options given after the cvs command (update or checkout)
22# don't remove -dP or things won't work 27# don't remove -dP from update or things won't work
28[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP"
23[ -z "$ECVS_CVS_OPTIONS" ] && ECVS_CVS_OPTIONS="-dP" 29[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
24 30
25# set this for the module/subdir to be fetched non-recursively 31# set this to some value for the module/subdir to be fetched non-recursively: ECVS_LOCAL
26#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 32
33# local name of module. useful if the module on the server is called
34# something common like 'driver' or is nested deep in a tree, and you don't
35# like useless empty directories.
36# WARNING: to be set only from within ebuilds! if set in your shell or some such,
37# things wil break because the ebuild won't expect it and have e.g. a wrong $S setting.
38# ECVS_LOCALNAME
27 39
28# Where the cvs modules are stored/accessed 40# Where the cvs modules are stored/accessed
29[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src" 41[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
30 42
31# Name of cvs server, set to "offline" to disable fetching 43# Name of cvs server, set to "offline" to disable fetching
32# (i.e. to assume module is checked out already and don't update it). 44# (i.e. to assume module is checked out already and don't update it).
33# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other 45# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other
34# parts of the full CVSROOT (which looks like 46# parts of the full CVSROOT (which looks like
35# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 47# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
36# other settings 48# other settings
49# the special value 'offline' disables fetching, assumes sources are alread in ECVS_TOP_DIR
37[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 50[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
38 51
39# Anonymous cvs login?
40# if 'yes' uses :pserver: with empty password, if 'no' uses :ext: with $ECVS_PASS, other values not allowed
41[ -z "$ECVS_ANON" ] && ECVS_ANON="yes"
42
43# Authentication method to use on ECVS_ANON="no" - possible values are "pserver" and "ext" 52# Authentication method to use - possible values are "pserver" and "ext"
53# WARNING ext is NOT supported! (never was, despite what earlier version of this file said)
44[ -z "$ECVS_AUTH" ] && ECVS_AUTH="ext" 54[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
55[ "$ECVS_AUTH" == ext ] && die "ERROR: ext auth not supported. If you want it, please contact danarmak@gentoo.org."
45 56
46# Use su to run cvs as user 57# Use su to run cvs as user
58# Currently b0rked and wouldn't work with portage userpriv anyway without special magic
47[ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`" 59# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
48 60
49# Username to use 61# Username to give to the server
50[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 62[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
51 63
52# Password to use if anonymous login is off 64# Password to use
53[ -z "$ECVS_PASS" ] && ECVS_PASS="" 65[ -z "$ECVS_PASS" ] && ECVS_PASS=""
54 66
55# Module to be fetched, must be set explicitly - 67# Module to be fetched, must be set when kde_src_unpack is called
56# I don't like the former ="$PN" default setting 68# can include several directory levels, ie foo/bar/baz
57[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue" 69#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
58 70
59# Branch/tag to use, default is HEAD 71# Branch/tag to use, default is HEAD
60# uncomment the following line to enable the reset-branch-to-HEAD behaviour 72# the following default _will_ reset your branch checkout to head if used
61[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD" 73#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
62 74
63# Subdirectory in module to be fetched, default is not defined = whole module 75# deprecated - do not use
64# DO NOT set default to "", if it's defined at all code will break! 76[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
65# don't uncomment following line!
66#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR=""
67 77
68# --- end ebuild-configurable settings --- 78# --- end ebuild-configurable settings ---
69 79
70# add cvs to deps 80# add cvs to deps
71DEPEND="$DEPEND dev-util/cvs dev-python/pexpect" 81# ssh is used for ext auth
82# sudo is used to run as a specified user
83DEPEND="$DEPEND dev-util/cvs app-admin/sudo"
84#[ "$ECVS_AUTH" == "ext" ] && DEPEND="$DEPEND net-misc/openssh"
72 85
73# since we now longer have src_fetch as a redefinable ebuild function, 86# calls cvs_contorl, is called from cvs_src_unpack
74# we are forced to call this function from cvs_src_unpack
75cvs_fetch() { 87cvs_fetch() {
76 88
89 # fix for sourceforge which doesnt want -z>3 anymore.
90
91 (echo $ECVS_SERVER | grep sourceforge) && [ "$ECVS_CVS_COMMAND" == "cvs -q -f -z4" ] && ECVS_CVS_COMMAND="cvs -q -f -z3"
92
93 debug-print-function $FUNCNAME $*
94
95 # parameters modifying other parameters that should be effective every time cvs_fetch is called,
96 # and not just every time cvs.eclas is inherited
97 # 1. parameter for local (non-recursive) fetching
98 if [ -n "$ECVS_LOCAL" ]; then
99 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
100 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
101 fi
102 # 2. cvs auto-switches branches, we just have to pass the correct -rBRANCH option to it when updating.
103 # doing it this way we get multiple -rX options - harmless afaik
104 if [ -n "$ECVS_BRANCH" ]; then
105 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
106 ECVS_CO_OPTS="$ECVS_CO_OPTS -r$ECVS_BRANCH"
107 fi
108
109 if [ "$ECVS_LOCALNAME" != "$ECVS_MODULE" ]; then
110 # the option to cvs on which this is based. note this isn't the same as the
111 # global -d option to cvs, which specifies the cvs server. ugh @ cvs syntax.
112 ECVS_CO_OPTS="$ECVS_CO_OPTS -d $ECVS_LOCALNAME"
113 fi
114
115 # it's easiest to always be in "run-as mode", logic-wise
116 # or would be if sudo didn't ask for a password even when sudo'ing to `whoami`
117 if [ -z "$ECVS_RUNAS" ]; then
118 run=""
119 else
120 run="sudo -u $ECVS_RUNAS"
121 fi
122
123 # create the top dir if needed
124 if [ ! -d "$ECVS_TOP_DIR" ]; then
125 # note that the addwrite statements in this block are only there to allow creating ECVS_TOP_DIR;
126 # we've already allowed writing inside it
127 # this is because it's simpler than trying to find out the parent path of the directory, which
128 # would need to be the real path and not a symlink for things to work (so we can't just remove
129 # the last path element in the string)
130 debug-print "$FUNCNAME: checkout mode. creating cvs directory"
131 addwrite /foobar
132 addwrite /
133 $run mkdir -p "/$ECVS_TOP_DIR"
134 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
135 fi
136
137 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
138 # otherwise addwrite() doesn't work.
139 cd -P "$ECVS_TOP_DIR" > /dev/null
140 ECVS_TOP_DIR="`/bin/pwd`"
141
142 # determine checkout or update mode
143 if [ ! -d "$ECVS_TOP_DIR/$ECVS_LOCALNAME/CVS" ]; then
144 mode=checkout
145 else
146 mode=update
147 fi
148
149 # disable the sandbox for this dir
150 addwrite "$ECVS_TOP_DIR"
151
152 # chowning the directory and all contents
153 if [ -n "$ECVS_RUNAS" ]; then
154 $run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR"
155 fi
156
157 # our server string (aka CVSROOT), without the password so it can be put in Root
158 server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
159
160 # switch servers automagically if needed
161 if [ "$mode" == "update" ]; then
162 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
163 oldserver="`$run cat CVS/Root`"
164 if [ "$server" != "$oldserver" ]; then
165 einfo "Changing CVS server from $oldserver to $server:"
166 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $server:"
167
168 einfo "Searching for CVS dirs ..."
169 cvsdirs="`$run find . -iname CVS -print`"
170 debug-print "$FUNCNAME: CVS dirs found:"
171 debug-print "$cvsdirs"
172
173 einfo "Modifying CVS dirs ..."
174 for x in $cvsdirs; do
175 debug-print "In $x"
176 $run echo "$server" > "$x/Root"
177 done
178 fi
179 fi
180
181 # prepare a cvspass file just for this session, we don't want to mess with ~/.cvspass
182 touch "${T}/cvspass"
183 export CVS_PASSFILE="${T}/cvspass"
184 if [ -n "$ECVS_RUNAS" ]; then
185 chown "$ECVS_RUNAS" "${T}/cvspass"
186 fi
187
188 # the server string with the password in it, for login
189 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
190 # ditto without the password, for checkout/update after login, so that
191 # the CVS/Root files don't contain the password in plaintext
192 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
193
194 # commands to run
195 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\""
196 cmdlogin_opts="login"
197 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\""
198 cmdupdate_opts="update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
199 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\""
200 cmdcheckout_opts="checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
201
202 cd "${ECVS_TOP_DIR}"
203 if [ "${ECVS_AUTH}" == "pserver" ]; then
204 debug-print "$FUNCNAME: logging into cvs ${cmdlogin} ${cmdlogin_opts}"
205 einfo "Logging in: ${cmdlogin}"
206 eval ${cmdlogin} ${cmdlogin_opts} >/dev/null || die "cvs login command failed"
207 if [ "${mode}" == "update" ]; then
208 debug-print "$FUNCNAME: updating cvs tree ${cmdupdate} ${cmdupdate_opts}"
209 einfo "Updating existing source tree: ${cmdupdate_opts}"
210 eval ${cmdupdate} ${cmdupdate_opts} || die "cvs update command failed"
211 elif [ "${mode}" == "checkout" ]; then
212 debug-print "$FUNCNAME: checking out from cvs tree ${cmdcheckout} ${cmdcheckout_opts}"
213 einfo "Checking out source tree (${cmdcheckout_opts})"
214 eval ${cmdcheckout} ${cmdcheckout_opts} || die "cvs checkout command failed"
215 fi
216# elif [ "${ECVS_AUTH}" == "ext" ]; then
217# # for ext there's also a possible ssh prompt, code not yet written
218# echo "${ECVS_DELAY} continue connecting&yes" >> "$instruct"
219# echo "${ECVS_DELAY} CVS password:&${ECVS_PASS}" >> "$instruct"
220# if [ "$mode" == "update" ]; then
221# expect "$cvsout" "$instruct" | $cmdupdate > "$cvsout"
222# elif [ "$mode" == "checkout" ]; then
223# expect "$cvsout" "$instruct" | $cmdcheckout > "$cvsout"
224# fi
225 fi
226
227 # restore ownership. not sure why this is needed, but someone added it in the orig ECVS_RUNAS stuff.
228 if [ -n "$ECVS_RUNAS" ]; then
229 chown `whoami` "${T}/cvspass"
230 fi
231}
232
233
234cvs_src_unpack() {
77 debug-print-function $FUNCNAME $* 235 debug-print-function $FUNCNAME $*
78 236
79 debug-print "$FUNCNAME: init: 237 debug-print "$FUNCNAME: init:
80ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 238ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
239ECVS_UP_OPTS=$ECVS_UP_OPTS
81ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 240ECVS_CO_OPTS=$ECVS_CO_OPTS
82ECVS_TOP_DIR=$ECVS_TOP_DIR 241ECVS_TOP_DIR=$ECVS_TOP_DIR
83ECVS_SERVER=$ECVS_SERVER 242ECVS_SERVER=$ECVS_SERVER
84ECVS_ANON=$ECVS_ANON
85ECVS_USER=$ECVS_USER 243ECVS_USER=$ECVS_USER
86ECVS_PASS=$ECVS_PASS 244ECVS_PASS=$ECVS_PASS
87ECS_MODULE=$ECVS_MODULE 245ECVS_MODULE=$ECVS_MODULE
88ECVS_SUBDIR=$ECVS_SUBDIR
89ECVS_LOCAL=$ECVS_LOCAL 246ECVS_LOCAL=$ECVS_LOCAL
90DIR=$DIR" 247ECVS_RUNAS=$ECVS_RUNAS
248ECVS_LOCALNAME=$ECVS_LOCALNAME"
91 249
92 # a shorthand 250 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
93 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 251
94 debug-print "$FUNCNAME: now DIR=$DIR" 252 # merely setting this default value makes things fail when cvs_src_unpack is called
253 # more than once per ebuild (eg kdenonbeta submodules); so if we set a default value,
254 # we disable it again at the function's end.
255 # of course, we could instead always reference it with the bash syntax for 'take default
256 # value from this other variable if undefined', but i'm lazy.
257 if [ -z "$ECVS_LOCALNAME" ]; then
258 ECVS_LOCALNAME="$ECVS_MODULE"
259 ECVS_LOCALNAME_SETDEFAULT=true
260 fi
95 261
96 if [ "$ECVS_SERVER" == "offline" ]; then 262 if [ "$ECVS_SERVER" == "offline" ]; then
97 # we're not required to fetch anything, the module already exists and shouldn't be updated 263 # we're not required to fetch anything, the module already exists and shouldn't be updated
98 if [ -d "$DIR" ]; then 264 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
99 debug-print "$FUNCNAME: offline mode, exiting" 265 debug-print "$FUNCNAME: offline mode"
100 return 0
101 else 266 else
102 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting."
103 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error" 267 debug-print "$FUNCNAME: offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
104 return 1 268 die "ERROR: Offline mode specified, but dir ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
105 fi 269 fi
270 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
271 einfo "Fetching module '$ECVS_MODULE' and saving in $ECVS_TOP_DIR ..."
272 cvs_fetch
273 else # ECVS_SERVER not set
274 die "ERROR: CVS server not set, cannot continue."
106 fi 275 fi
107 276
108 # create target directory as needed 277 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..."
109 if [ ! -d "$DIR" ]; then 278 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..."
110 debug-print "$FUNCNAME: creating cvs directory $DIR"
111 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
112 addwrite /foobar
113 addwrite /
114 mkdir -p /$DIR
115 export SANDBOX_WRITE=${SANDBOX_WRITE//:\/foobar:\/}
116 fi
117 279
118 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path, 280 # probably redundant, but best to make sure
119 # otherwise addwrite() doesn't work. 281 mkdir -p "$WORKDIR/$ECVS_LOCALNAME"
120 cd -P $ECVS_TOP_DIR > /dev/null
121 ECVS_TOP_DIR="`/bin/pwd`"
122 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
123 cd $OLDPWD
124
125 debug-print "$FUNCNAME: now DIR=$DIR"
126
127 # disable the sandbox for this dir
128 # not just $DIR because we want to create moduletopdir/CVS too
129 addwrite $ECVS_TOP_DIR/$ECVS_MODULE
130 282
131 # add option for local (non-recursive) fetching
132 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
133
134 # prepare a cvspass file just for this session so that cvs thinks we're logged
135 # in at the cvs server. we don't want to mess with ~/.cvspass.
136 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass
137 export CVS_PASSFILE="${T}/cvspass"
138 chown $ECVS_RUNAS "${T}/cvspass"
139 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
140
141 # Note: cvs update and checkout commands are unified.
142 # we make sure a CVS/ dir exists in our module subdir with the right
143 # Root and Repository entries in it and cvs update.
144
145 [ "${ECVS_ANON}" == "yes" ] && \
146 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
147 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
148
149
150 # CVS/Repository files can't (I think) contain two concatenated slashes
151 if [ -n "$ECVS_SUBDIR" ]; then 283 if [ -n "$ECVS_LOCAL" ]; then
152 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 284 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME"
153 else 285 else
154 repository="${ECVS_MODULE}" 286 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.."
155 fi
156
157 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
158 debug-print "$FUNCNAME: entering directory $DIR"
159 cd /$DIR
160
161 if [ ! -d "CVS" ]; then
162 # create a new CVS/ directory (checkout)
163 debug-print "$FUNCNAME: creating new cvs directory"
164
165 mkdir CVS
166 echo $newserver > CVS/Root
167 echo $repository > CVS/Repository
168 touch CVS/Entries
169
170 # if we're checking out a subdirectory only, create a CVS/ dir
171 # in the module's top dir so that the user (and we) can cvs update
172 # from there to get the full module.
173 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
174 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
175 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/
176 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository
177 fi 287 fi
178
179 else
180 #update existing module
181 debug-print "$FUNCNAME: updating existing module/subdir"
182
183 # Switch servers if needed
184 # cvs keeps the server info in the CVS/Root file in every checked-out dir;
185 # we can fix those files to point to the new server
186 oldserver="`cat CVS/Root`"
187 if [ "$newserver" != "$oldserver" ]; then
188 288
189 einfo "Changing CVS server from $oldserver to $newserver:"
190 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:"
191
192 einfo "Searching for CVS dirs..."
193 cvsdirs="`find . -iname CVS -print`"
194 debug-print "$FUNCNAME: CVS dirs found:"
195 debug-print "$cvsdirs"
196
197 einfo "Modifying CVS dirs..."
198 for x in $cvsdirs; do
199 debug-print "In $x"
200 echo $newserver > $x/Root
201 done
202
203 fi
204
205 fi
206
207 # cvs auto-switches branches, how nice
208 # warning: if we do it this way we get multiple -rX options - harmless i think
209 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH"
210
211 # Chowning the directory
212 if [ "${ECVS_RUNAS}" != "root" ]; then
213 chown -R "$ECVS_RUNAS" /$DIR
214 fi
215
216 # finally run the cvs update command
217 debug-print "$FUNCNAME: is in dir `/bin/pwd`"
218 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR"
219 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..."
220
221 if [ "${ECVS_ANON}" == "no" ]; then
222
223 debug-print "$FUNCNAME: starting non-anonymous cvs login..."
224 # CVS Login - written in python :: the right way ;)
225 # Tilman Klar, <phoenix@gentoo.org>
226
227 export CVS_RSH="/usr/bin/ssh"
228
229############################## inline-python #####################################
230/usr/bin/env python << EndOfFile
231
232import pexpect,os
233
234mypasswd = "${ECVS_PASS}"
235myauth = "${ECVS_AUTH}"
236mytimeout = 10
237
238if myauth == "ext":
239 mycommand = "su ${ECVS_RUNAS} -c \"${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}\""
240 child = pexpect.spawn(mycommand)
241
242 index = child.expect(['continue connecting','word:'], mytimeout)
243 if index == 0:
244 child.sendline('yes')
245 ## Added server to ~/.ssh/known_hosts
246 child.expect('word:', mytimeout)
247 else:
248 ## Server already is in ~/.ssh/known_hosts
249 pass
250
251 child.sendline(mypasswd)
252 child.expect(pexpect.EOF)
253
254elif myauth == "pserver":
255 mycommand = "su ${ECVS_RUNAS} -c \"cvs login\""
256 child = pexpect.spawn(mycommand)
257 child.expect("CVS password:",mytimeout)
258 child.sendline(mypasswd)
259 child.expect(pexpect.EOF)
260
261 # Logged in - checking out
262 os.system("su ${ECVS_RUNAS} -c \"${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}\" &> /dev/null")
263EndOfFile
264########################### End of inline-python ##################################
265 else
266 debug-print "$FUNCNAME: using anonymous cvs login"
267 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
268 fi
269
270 # log out and restore ownership
271 su $ECVS_RUNAS -c "cvs logout" &> /dev/null
272 chown root ${T}/cvspass
273}
274
275cvs_src_unpack() {
276
277 debug-print-function $FUNCNAME $*
278 cvs_fetch || die "died running cvs_fetch"
279
280 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
281 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
282
283 # probably redundant, but best to make sure
284 mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR
285
286 if [ -n "$ECVS_SUBDIR" ]; then
287 if [ -n "$ECVS_LOCAL" ]; then
288 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR
289 else
290 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/..
291 fi
292 else
293 if [ -n "$ECVS_LOCAL" ]; then
294 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE
295 else
296 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR
297 fi
298 fi
299
300 # if the directory is empty, remove it; empty directories cannot exist in cvs. 289 # if the directory is empty, remove it; empty directories cannot exist in cvs.
301 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist. 290 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
302 # still create the empty directory in workdir though. 291 # still create the empty directory in workdir though.
303 if [ "`ls -A $DIR`" == "CVS" ]; then 292 if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_LOCALNAME}\"`" == "CVS" ]; then
304 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR" 293 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_LOCALNAME"
305 rm -rf $DIR 294 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
306 fi 295 fi
307 296
308 # implement some of base_src_unpack's functionality; 297 # implement some of base_src_unpack's functionality;
309 # note however that base.eclass may not have been inherited! 298 # note however that base.eclass may not have been inherited!
310 if [ -n "$PATCHES" ]; then 299 if [ -n "$PATCHES" ]; then
311 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 300 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
312 cd $S 301 cd "$S"
313 for x in $PATCHES; do 302 for x in $PATCHES; do
314 debug-print "patching from $x" 303 debug-print "patching from $x"
315 patch -p0 < $x 304 patch -p0 < "$x"
316 done 305 done
317 # make sure we don't try to apply patches more than once, since 306 # make sure we don't try to apply patches more than once, since
318 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack 307 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
319 export PATCHES="" 308 export PATCHES=""
320 fi 309 fi
310
311 if [ -n "$ECVS_LOCALNAME_SETDEFAULT" ]; then
312 unset ECVS_LOCALNAME
313 unset ECVS_LOCALNAME_SETDEFAULT
314 fi
321 315
316 einfo "Module $ECVS_MODULE is now in ${WORKDIR}"
322} 317}
323 318
324EXPORT_FUNCTIONS src_unpack 319EXPORT_FUNCTIONS src_unpack

Legend:
Removed from v.1.24  
changed lines
  Added in v.1.46

  ViewVC Help
Powered by ViewVC 1.1.20