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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.31  
changed lines
  Added in v.1.42

  ViewVC Help
Powered by ViewVC 1.1.20