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

Diff of /eclass/cvs.eclass

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

Revision 1.8 Revision 1.33
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 or later 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.33 2003/03/19 11:54:21 danarmak 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.8 2002/08/02 09:44:35 danarmak Exp $ 6#
5# This eclass provides the generic cvs fetching functions. 7# This eclass provides the generic cvs fetching functions.
6 8
7ECLASS=cvs 9ECLASS=cvs
8INHERITED="$INHERITED $ECLASS" 10INHERITED="$INHERITED $ECLASS"
9 11
24 26
25# set this for the module/subdir to be fetched non-recursively 27# set this for the module/subdir to be fetched non-recursively
26#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 28#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
27 29
28# Where the cvs modules are stored/accessed 30# Where the cvs modules are stored/accessed
29[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="/usr/src" 31[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
30 32
31# Name of cvs server, set to "" to disable fetching 33# 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). 34# (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 35# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other
34# parts of the full CVSROOT (which looks like 36# parts of the full CVSROOT (which looks like
35# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 37# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
36# other settings 38# other settings
37[ -z "$ECVS_SERVER" ] && ECVS_SERVER="" 39[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
40
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"
46[ -z "$ECVS_AUTH" ] && ECVS_AUTH="ext"
47
48# Use su to run cvs as user
49[ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
38 50
39# Username to use 51# Username to use
40[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 52[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
41 53
42# Password to use (NOT (YET) SUPPORTED, because cvs doesn't store passwords in plaintext in .cvspass) 54# Password to use if anonymous login is off, or if 'anonymous' pserver access
55# uses a password and ECVS_ANON = yes
43[ -z "$ECVS_PASS" ] && ECVS_PASS="" 56[ -z "$ECVS_PASS" ] && ECVS_PASS=""
44 57
45# Module to be fetched, must be set explicitly - 58# Module to be fetched, must be set explicitly -
46# I don't like the former ="$NP" default setting 59# I don't like the former ="$PN" default setting
47[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 60[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue"
61
62# Branch/tag to use, default is HEAD
63# uncomment the following line to enable the reset-branch-to-HEAD behaviour
64[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
48 65
49# Subdirectory in module to be fetched, default is not defined = whole module 66# Subdirectory in module to be fetched, default is not defined = whole module
50# DO NOT set default to "", if it's defined at all code will break! 67# DO NOT set default to "", if it's defined at all code will break!
51# don't uncomment following line! 68# don't uncomment following line!
52#[ -z "$ECVS_MODULE_SUBDIR" ] && ECVS_MODULE_SUBDIR="" 69#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR=""
53 70
54# --- end ebuild-configurable settings --- 71# --- end ebuild-configurable settings ---
55 72
56# add cvs to deps 73# add cvs to deps
57DEPEND="$DEPEND dev-util/cvs" 74DEPEND="$DEPEND dev-util/cvs dev-python/pexpect"
58 75
59# since we now longer have src_fetch as a redefinable ebuild function, 76# since we now longer have src_fetch as a redefinable ebuild function,
60# we are forced to call this function from cvs_src_unpack 77# we are forced to call this function from cvs_src_unpack
61cvs_fetch() { 78cvs_fetch() {
62 79
63 debug-print-function $FUNCNAME $* 80 debug-print-function $FUNCNAME $*
64 81
65 debug-print "$FUNCNAME: init: 82 debug-print "$FUNCNAME: init:
66ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 839ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
67ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 84ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS
68ECVS_TOP_DIR=$ECVS_TOP_DIR 85ECVS_TOP_DIR=$ECVS_TOP_DIR
69ECVS_SERVER=$ECVS_SERVER 86ECVS_SERVER=$ECVS_SERVER
87ECVS_ANON=$ECVS_ANON
70ECVS_USER=$ECVS_USER 88ECVS_USER=$ECVS_USER
71ECVS_PASS=$ECVS_PASS 89ECVS_PASS=$ECVS_PASS
72ECS_MODULE=$ECVS_MODULE 90ECS_MODULE=$ECVS_MODULE
73ECVS_MODULE_SUBDIR=$ECVS_SUBDIR 91ECVS_SUBDIR=$ECVS_SUBDIR
74ECVS_LOCAL=$ECVS_LOCAL 92ECVS_LOCAL=$ECVS_LOCAL
75DIR=$DIR" 93DIR=$DIR"
76 94
77 # a shorthand 95 # a shorthand
78 [ -n "$ECVS_SUBDIR" ] && DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" || \
79 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}" 96 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
97 debug-print "$FUNCNAME: now DIR=$DIR"
80 98
81 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
82
83 addread $DIR
84
85 if [ -z "$ECVS_SERVER" ]; then 99 if [ "$ECVS_SERVER" == "offline" ]; then
86 # we're not required to fetch anything, the module already exists and shouldn't be updated 100 # we're not required to fetch anything, the module already exists and shouldn't be updated
87 if [ -d "$DIR" ]; then 101 if [ -d "$DIR" ]; then
88 debug-print "$FUNCNAME: offline mode, exiting" 102 debug-print "$FUNCNAME: offline mode, exiting"
89 return 0 103 return 0
90 else 104 else
91 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting." 105 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting."
92 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error" 106 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
93 return 1 107 return 1
94 fi
95 fi 108 fi
109 fi
96 110
97 # disable the sandbox for this dir 111 # create target directory as needed
98
99 # not just $DIR because we want to create moduletopdir/CVS too
100 addwrite $ECVS_TOP_DIR/$ECVS_MODULE
101
102 if [ ! -d "$DIR" ]; then 112 if [ ! -d "$DIR" ]; then
103 debug-print "$FUNCNAME: creating cvs directory $DIR" 113 debug-print "$FUNCNAME: creating cvs directory $DIR"
104 einfo "Creating directory $DIR" 114 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
115 addwrite /foobar
116 addwrite /
105 mkdir -p /$DIR 117 mkdir -p "/$DIR"
118 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
106 fi 119 fi
107 120
108 # prepare a cvspass file just for this session so that cvs thinks we're logged 121 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
109 # in at the cvs server. we don't want to mess with ~/.cvspass. 122 # otherwise addwrite() doesn't work.
110 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass 123 cd -P "$ECVS_TOP_DIR" > /dev/null
124 ECVS_TOP_DIR="`/bin/pwd`"
125 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
126 cd "$OLDPWD"
127
128 debug-print "$FUNCNAME: now DIR=$DIR"
129
130 # disable the sandbox for this dir
131 # not just $DIR because we want to create moduletopdir/CVS too
132 addwrite "$ECVS_TOP_DIR/$ECVS_MODULE"
133
134 # add option for local (non-recursive) fetching
135 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
136
137 # prepare a cvspass file just for this session, we don't want to mess with ~/.cvspass
138 touch "${T}/cvspass"
111 export CVS_PASSFILE="${T}/cvspass" 139 export CVS_PASSFILE="${T}/cvspass"
112 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER} 140 chown $ECVS_RUNAS "${T}/cvspass"
113 141
114 # Note: cvs update and checkout commands are unified. 142 # Note: cvs update and checkout commands are unified.
115 # we make sure a CVS/ dir exists in our module subdir with the right 143 # we make sure a CVS/ dir exists in our module subdir with the right
116 # Root and Repository entries in it and cvs update. 144 # Root and Repository entries in it and cvs update.
117 145
118 newserver=":pserver:anonymous@${ECVS_SERVER}" 146 [ "${ECVS_ANON}" == "yes" ] && \
147 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
148 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
149
119 150
120 # CVS/Repository files can't (I think) contain two concatenated slashes 151 # CVS/Repository files can't (I think) contain two concatenated slashes
121 if [ -n "$ECVS_SUBDIR" ]; then 152 if [ -n "$ECVS_SUBDIR" ]; then
122 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 153 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
123 else 154 else
124 repository="${ECVS_MODULE}" 155 repository="${ECVS_MODULE}"
125 fi 156 fi
126 157
127 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository" 158 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
128 159 debug-print "$FUNCNAME: entering directory $DIR"
129 cd $DIR 160 cd "/$DIR"
161
130 if [ ! -d "$DIR/CVS" ]; then 162 if [ ! -d "CVS" ]; then
131 # create a new CVS/ directory (checkout) 163 # create a new CVS/ directory (checkout)
132 debug-print "$FUNCNAME: creating new cvs directory" 164 debug-print "$FUNCNAME: creating new cvs directory"
133 165
134 mkdir CVS 166 mkdir CVS
135 echo $newserver > CVS/Root 167 echo $newserver > CVS/Root
139 # if we're checking out a subdirectory only, create a CVS/ dir 171 # if we're checking out a subdirectory only, create a CVS/ dir
140 # in the module's top dir so that the user (and we) can cvs update 172 # in the module's top dir so that the user (and we) can cvs update
141 # from there to get the full module. 173 # from there to get the full module.
142 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then 174 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
143 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir" 175 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
144 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/ 176 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
145 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository 177 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
146 fi 178 fi
147 179
148 else 180 else
149 #update existing module 181 #update existing module
150 debug-print "$FUNCNAME: updating existing module/subdir" 182 debug-print "$FUNCNAME: updating existing module/subdir"
164 debug-print "$cvsdirs" 196 debug-print "$cvsdirs"
165 197
166 einfo "Modifying CVS dirs..." 198 einfo "Modifying CVS dirs..."
167 for x in $cvsdirs; do 199 for x in $cvsdirs; do
168 debug-print "In $x" 200 debug-print "In $x"
169 echo $newserver > $x/Root 201 echo $newserver > "$x/Root"
170 done 202 done
171 203
172 fi 204 fi
173 205
174 fi 206 fi
175 207
208 # cvs auto-switches branches, how nice
209 # warning: if we do it this way we get multiple -rX options - harmless i think
210 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH"
211
212 # Chowning the directory
213 if [ "${ECVS_RUNAS}" != "`whoami`" ]; then
214 chown -R "$ECVS_RUNAS" "/$DIR"
215 fi
216
176 # finally run the cvs update command 217 # finally run the cvs update command
218 debug-print "$FUNCNAME: is in dir `/bin/pwd`"
177 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR" 219 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR"
178 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..." 220 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..."
221
222 if [ "${ECVS_ANON}" == "no" ]; then
223
224 debug-print "$FUNCNAME: starting non-anonymous cvs login..."
225 # CVS Login - written in python :: the right way ;)
226 # Tilman Klar, <phoenix@gentoo.org>
227
228 export CVS_RSH="/usr/bin/ssh"
229
230############################## inline-python #####################################
231/usr/bin/env python << EndOfFile
232
233import pexpect,os
234
235mypasswd = "${ECVS_PASS}"
236myauth = "${ECVS_AUTH}"
237mytimeout = 10
238
239if "${ECVS_RUNAS}" == "`whoami`":
240 mycommand = "${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}"
241else:
242 mycommand = "su ${ECVS_RUNAS} -c \"${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}\""
243
244if myauth == "ext":
245 child = pexpect.spawn(mycommand)
246
247 index = child.expect(['continue connecting','word:'], mytimeout)
248 if index == 0:
249 child.sendline('yes')
250 ## Added server to ~/.ssh/known_hosts
251 child.expect('word:', mytimeout)
252 else:
253 ## Server already is in ~/.ssh/known_hosts
254 pass
255
256 child.sendline(mypasswd)
257 child.expect(pexpect.EOF)
258
259elif myauth == "pserver":
260 if "${ECVS_RUNAS}" == "`whoami`":
261 mycommand2 = "cvs login"
262 else:
263 mycommand2 = "su ${ECVS_RUNAS} -c \"cvs login\""
264 child = pexpect.spawn(mycommand2)
265 child.expect("CVS password:",mytimeout)
266 child.sendline(mypasswd)
267 child.expect(pexpect.EOF)
268
269 # Logged in - checking out
270 os.system(mycommand)
271
272EndOfFile
273########################### End of inline-python ##################################
274 else
275 # is anonymous cvs.
276 # is there a password to use for login with this "anonymous" login
277 if [ -n "$ECVS_PASS" ]; then
278 debug-print "$FUNCNAME: using anonymous cvs login with password"
279
280# inline-python #
281/usr/bin/env python << EndOfFile
282
283import pexpect,os
284
285myuser = "${ECVS_USER}"
286mypasswd = "${ECVS_PASS}"
287
288mytimeout = 10
289
290# implicitly myauth == "pserver" here.
291mycommand = "cvs login"
292child = pexpect.spawn(mycommand)
293child.expect("CVS password:",mytimeout)
294child.sendline(mypasswd)
295child.expect(pexpect.EOF)
296EndOfFile
297# End of inline-python #
298
299 else
300 debug-print "$FUNCNAME: using anonymous cvs login (without password)"
301 # passwordless, truly anonymous login; or login with empty (but existing)
302 # password.
303 # make cvs think we're logged in at the cvs server,
304 # because i don't trust myself to write the right code for the case
305 # where the password is empty but still required (what's the bash test
306 # to see if a variable is defined? -n returns false if it is defined
307 # but empty...)
308 echo ":pserver:${ECVS_SERVER} A" > "${T}/cvspass"
309 # remember we did this so we don't try to run cvs logout later
310 DONT_LOGOUT=yes
311 fi
312
313 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS"
179 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update" 314 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
180 315
316 fi
317
318 # log out and restore ownership as needed
319 if [ -z "$DONT_LOGOUT" ]; then
320 debug-print "$FUNCNAME: cvs logout stuff"
321 if [ "$ECVS_RUNAS" == "`whoami`" ]; then
322 cvs logout &> /dev/null
323 else
324 su $ECVS_RUNAS -c "cvs logout" &> /dev/null
325 fi
326 fi
327 chown `whoami` "${T}/cvspass"
181} 328}
182 329
183cvs_src_unpack() { 330cvs_src_unpack() {
184 331
185 debug-print-function $FUNCNAME $* 332 debug-print-function $FUNCNAME $*
186 cvs_fetch || die "died running cvs_fetch" 333 cvs_fetch || die "died running cvs_fetch"
187 334
188 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 335 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
189 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 336 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
337
338 # probably redundant, but best to make sure
339 mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
190 340
191 if [ -n "$ECVS_SUBDIR" ]; then 341 if [ -n "$ECVS_SUBDIR" ]; then
192 mkdir $WORKDIR/$ECVS_MODULE 342 if [ -n "$ECVS_LOCAL" ]; then
343 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR"/* "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
344 else
193 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR $WORKDIR/$ECVS_MODULE 345 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
346 fi
194 else 347 else
195 if [ -n "$ECVS_LOCAL" ]; then 348 if [ -n "$ECVS_LOCAL" ]; then
196 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE 349 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE"/* $WORKDIR/$ECVS_MODULE
197 else 350 else
198 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR 351 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
199 fi
200 fi 352 fi
201 353 fi
354
355 # if the directory is empty, remove it; empty directories cannot exist in cvs.
356 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
357 # still create the empty directory in workdir though.
358 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then
359 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
360 rm -rf "$DIR"
361 fi
362
202 # implement some of base_src_unpack's functionality; 363 # implement some of base_src_unpack's functionality;
203 # note however that base.eclass may not have been inherited! 364 # note however that base.eclass may not have been inherited!
204 if [ -n "$PATCHES" ]; then 365 if [ -n "$PATCHES" ]; then
205 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 366 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
206 cd $S 367 cd "$S"
207 for x in $PATCHES; do 368 for x in $PATCHES; do
208 debug-print "patching from $x" 369 debug-print "patching from $x"
209 patch -p0 < $x 370 patch -p0 < "$x"
210 done 371 done
211 fi 372 # make sure we don't try to apply patches more than once, since
373 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
374 export PATCHES=""
375 fi
212 376
213} 377}
214 378
215EXPORT_FUNCTIONS src_unpack 379EXPORT_FUNCTIONS src_unpack
216
217

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.33

  ViewVC Help
Powered by ViewVC 1.1.20