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

Diff of /eclass/cvs.eclass

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

Revision 1.12 Revision 1.32
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.32 2003/02/21 14:07:46 phoenix 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.12 2002/08/18 23:54:59 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 "offline" 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="offline" 39[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
38 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`"
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 ="$PN" default setting 59# I don't like the former ="$PN" default setting
47[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue" 60[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue"
48 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"
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
65 debug-print "$FUNCNAME: init: 82 debug-print "$FUNCNAME: init:
66ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 83ECVS_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 [ "$ECVS_SERVER" == "offline" ]; 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"
105 export SANDBOX_WRITE="$SANDBOX_WRITE:/foo:/" 114 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
115 addwrite /foobar
116 addwrite /
106 mkdir -p /$DIR 117 mkdir -p "/$DIR"
107 export SANDBOX_WRITE=${SANDBOX_WRITE//:\/foo:\/} 118 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
108 fi 119 fi
109 120
121 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
122 # otherwise addwrite() doesn't work.
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
110 # prepare a cvspass file just for this session so that cvs thinks we're logged 137 # prepare a cvspass file just for this session so that cvs thinks we're logged
111 # in at the cvs server. we don't want to mess with ~/.cvspass. 138 # in at the cvs server. we don't want to mess with ~/.cvspass.
112 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass 139 echo ":pserver:${ECVS_SERVER} A" > "${T}/cvspass"
113 export CVS_PASSFILE="${T}/cvspass" 140 export CVS_PASSFILE="${T}/cvspass"
141 chown $ECVS_RUNAS "${T}/cvspass"
114 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER} 142 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
115 143
116 # Note: cvs update and checkout commands are unified. 144 # Note: cvs update and checkout commands are unified.
117 # we make sure a CVS/ dir exists in our module subdir with the right 145 # we make sure a CVS/ dir exists in our module subdir with the right
118 # Root and Repository entries in it and cvs update. 146 # Root and Repository entries in it and cvs update.
119 147
120 newserver=":pserver:anonymous@${ECVS_SERVER}" 148 [ "${ECVS_ANON}" == "yes" ] && \
149 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
150 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
151
121 152
122 # CVS/Repository files can't (I think) contain two concatenated slashes 153 # CVS/Repository files can't (I think) contain two concatenated slashes
123 if [ -n "$ECVS_SUBDIR" ]; then 154 if [ -n "$ECVS_SUBDIR" ]; then
124 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 155 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
125 else 156 else
126 repository="${ECVS_MODULE}" 157 repository="${ECVS_MODULE}"
127 fi 158 fi
128 159
129 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository" 160 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
130 161 debug-print "$FUNCNAME: entering directory $DIR"
131 cd $DIR 162 cd "/$DIR"
163
132 if [ ! -d "$DIR/CVS" ]; then 164 if [ ! -d "CVS" ]; then
133 # create a new CVS/ directory (checkout) 165 # create a new CVS/ directory (checkout)
134 debug-print "$FUNCNAME: creating new cvs directory" 166 debug-print "$FUNCNAME: creating new cvs directory"
135 167
136 mkdir CVS 168 mkdir CVS
137 echo $newserver > CVS/Root 169 echo $newserver > CVS/Root
141 # if we're checking out a subdirectory only, create a CVS/ dir 173 # if we're checking out a subdirectory only, create a CVS/ dir
142 # in the module's top dir so that the user (and we) can cvs update 174 # in the module's top dir so that the user (and we) can cvs update
143 # from there to get the full module. 175 # from there to get the full module.
144 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then 176 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
145 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir" 177 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
146 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/ 178 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
147 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository 179 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
148 fi 180 fi
149 181
150 else 182 else
151 #update existing module 183 #update existing module
152 debug-print "$FUNCNAME: updating existing module/subdir" 184 debug-print "$FUNCNAME: updating existing module/subdir"
166 debug-print "$cvsdirs" 198 debug-print "$cvsdirs"
167 199
168 einfo "Modifying CVS dirs..." 200 einfo "Modifying CVS dirs..."
169 for x in $cvsdirs; do 201 for x in $cvsdirs; do
170 debug-print "In $x" 202 debug-print "In $x"
171 echo $newserver > $x/Root 203 echo $newserver > "$x/Root"
172 done 204 done
173 205
174 fi 206 fi
175 207
176 fi 208 fi
177 209
210 # cvs auto-switches branches, how nice
211 # warning: if we do it this way we get multiple -rX options - harmless i think
212 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH"
213
214 # Chowning the directory
215 if [ "${ECVS_RUNAS}" != "`whoami`" ]; then
216 chown -R "$ECVS_RUNAS" "/$DIR"
217 fi
218
178 # finally run the cvs update command 219 # finally run the cvs update command
220 debug-print "$FUNCNAME: is in dir `/bin/pwd`"
179 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR" 221 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR"
180 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..." 222 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..."
223
224 if [ "${ECVS_ANON}" == "no" ]; then
225
226 debug-print "$FUNCNAME: starting non-anonymous cvs login..."
227 # CVS Login - written in python :: the right way ;)
228 # Tilman Klar, <phoenix@gentoo.org>
229
230 export CVS_RSH="/usr/bin/ssh"
231
232############################## inline-python #####################################
233/usr/bin/env python << EndOfFile
234
235import pexpect,os
236
237mypasswd = "${ECVS_PASS}"
238myauth = "${ECVS_AUTH}"
239mytimeout = 10
240
241if "${ECVS_RUNAS}" == "`whoami`":
242 mycommand = "${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}"
243else:
244 mycommand = "su ${ECVS_RUNAS} -c \"${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}\""
245
246if myauth == "ext":
247 child = pexpect.spawn(mycommand)
248
249 index = child.expect(['continue connecting','word:'], mytimeout)
250 if index == 0:
251 child.sendline('yes')
252 ## Added server to ~/.ssh/known_hosts
253 child.expect('word:', mytimeout)
254 else:
255 ## Server already is in ~/.ssh/known_hosts
256 pass
257
258 child.sendline(mypasswd)
259 child.expect(pexpect.EOF)
260
261elif myauth == "pserver":
262 if "${ECVS_RUNAS}" == "`whoami`":
263 mycommand2 = "cvs login"
264 else:
265 mycommand2 = "su ${ECVS_RUNAS} -c \"cvs login\""
266 child = pexpect.spawn(mycommand2)
267 child.expect("CVS password:",mytimeout)
268 child.sendline(mypasswd)
269 child.expect(pexpect.EOF)
270
271 # Logged in - checking out
272 os.system(mycommand)
273
274EndOfFile
275########################### End of inline-python ##################################
276 else
277 # is anonymous cvs.
278 debug-print "$FUNCNAME: using anonymous cvs login"
279 # is there a password to use for login with this "anonymous" login
280 if [ -n $ECVS_PASS ]; then
281 debug-print "$FUNCNAME: using anonymous cvs login with password"
282
283# inline-python #
284/usr/bin/env python << EndOfFile
285
286import pexpect,os
287
288myuser = "${ECVS_USER}"
289mypasswd = "${ECVS_PASS}"
290
291mytimeout = 10
292
293# implicitly myauth == "pserver" here.
294mycommand = "cvs login"
295child = pexpect.spawn(mycommand)
296child.expect("CVS password:",mytimeout)
297child.sendline(mypasswd)
298child.expect(pexpect.EOF)
299EndOfFile
300# End of inline-python #
301
302 fi
181 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update" 303 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
182 304
305 fi
306
307 # log out and restore ownership
308 if [ "$ECVS_RUNAS" == "`whoami`" ]; then
309 cvs logout &> /dev/null
310 else
311 su $ECVS_RUNAS -c "cvs logout" &> /dev/null
312 fi
313 chown `whoami` "${T}/cvspass"
183} 314}
184 315
185cvs_src_unpack() { 316cvs_src_unpack() {
186 317
187 debug-print-function $FUNCNAME $* 318 debug-print-function $FUNCNAME $*
188 cvs_fetch || die "died running cvs_fetch" 319 cvs_fetch || die "died running cvs_fetch"
189 320
190 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 321 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
191 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 322 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
323
324 # probably redundant, but best to make sure
325 mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
192 326
193 if [ -n "$ECVS_SUBDIR" ]; then 327 if [ -n "$ECVS_SUBDIR" ]; then
194 mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR
195 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/
196 else
197 if [ -n "$ECVS_LOCAL" ]; then 328 if [ -n "$ECVS_LOCAL" ]; then
198 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE 329 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR"/* "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
199 else 330 else
331 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
332 fi
333 else
334 if [ -n "$ECVS_LOCAL" ]; then
335 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE"/* $WORKDIR/$ECVS_MODULE
336 else
200 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR 337 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
201 fi 338 fi
202 fi 339 fi
203 340
204 # if the directory is empty, remove it; empty directories cannot exist in cvs. 341 # if the directory is empty, remove it; empty directories cannot exist in cvs.
205 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist. 342 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
206 # still create the empty directory in workdir though. 343 # still create the empty directory in workdir though.
207 if [ "`ls -A $DIR`" == "CVS" ]; then 344 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then
208 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR" 345 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
209 rm -rf $DIR 346 rm -rf "$DIR"
210 fi 347 fi
211 348
212 # implement some of base_src_unpack's functionality; 349 # implement some of base_src_unpack's functionality;
213 # note however that base.eclass may not have been inherited! 350 # note however that base.eclass may not have been inherited!
214 if [ -n "$PATCHES" ]; then 351 if [ -n "$PATCHES" ]; then
215 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 352 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
216 cd $S 353 cd "$S"
217 for x in $PATCHES; do 354 for x in $PATCHES; do
218 debug-print "patching from $x" 355 debug-print "patching from $x"
219 patch -p0 < $x 356 patch -p0 < "$x"
220 done 357 done
221 # make sure we don't try to apply patches more than once, since 358 # make sure we don't try to apply patches more than once, since
222 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack 359 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
223 export PATCHES="" 360 export PATCHES=""
224 fi 361 fi
225 362
226} 363}
227 364
228EXPORT_FUNCTIONS src_unpack 365EXPORT_FUNCTIONS src_unpack
229
230

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.32

  ViewVC Help
Powered by ViewVC 1.1.20