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

Diff of /eclass/cvs.eclass

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

Revision 1.6 Revision 1.31
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.31 2003/02/16 04:26:21 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.6 2002/08/01 19:16:31 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
… …
14# --- begin ebuild-configurable settings 16# --- begin ebuild-configurable settings
15 17
16# cvs command to run. you can set fex. "cvs -t" for extensive debug information 18# 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 19# 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. 20# the ~/.cvsrc config file and to use maximum compression.
19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -f -z4" 21[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
22
23# cvs options given after the command (i.e. cvs update foo)
24# don't remove -dP or things won't work
25[ -z "$ECVS_CVS_OPTIONS" ] && ECVS_CVS_OPTIONS="-dP"
26
27# set this for the module/subdir to be fetched non-recursively
28#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
20 29
21# Where the cvs modules are stored/accessed 30# Where the cvs modules are stored/accessed
22[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="/usr/src" 31[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
23 32
24# Name of cvs server, set to "" to disable fetching 33# Name of cvs server, set to "offline" to disable fetching
25# (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).
26# 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
27# parts of the full CVSROOT (which looks like 36# parts of the full CVSROOT (which looks like
28# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 37# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
29# other settings 38# other settings
30[ -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`"
31 50
32# Username to use 51# Username to use
33[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 52[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
34 53
35# 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
36[ -z "$ECVS_PASS" ] && ECVS_PASS="" 55[ -z "$ECVS_PASS" ] && ECVS_PASS=""
37 56
38# Module to be fetched, must be set explicitly - 57# Module to be fetched, must be set explicitly -
39# I don't like the former ="$NP" default setting 58# I don't like the former ="$PN" default setting
40[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 59[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue"
60
61# Branch/tag to use, default is HEAD
62# uncomment the following line to enable the reset-branch-to-HEAD behaviour
63[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
41 64
42# Subdirectory in module to be fetched, default is not defined = whole module 65# Subdirectory in module to be fetched, default is not defined = whole module
43# DO NOT set default to "", if it's defined at all code will break! 66# DO NOT set default to "", if it's defined at all code will break!
44# don't uncomment following line! 67# don't uncomment following line!
45#[ -z "$ECVS_MODULE_SUBDIR" ] && ECVS_MODULE_SUBDIR="" 68#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR=""
46 69
47# --- end ebuild-configurable settings --- 70# --- end ebuild-configurable settings ---
48 71
49# add cvs to deps 72# add cvs to deps
50DEPEND="$DEPEND dev-util/cvs" 73DEPEND="$DEPEND dev-util/cvs dev-python/pexpect"
51 74
52# since we now longer have src_fetch as a redefinable ebuild function, 75# since we now longer have src_fetch as a redefinable ebuild function,
53# we are forced to call this function from cvs_src_unpack 76# we are forced to call this function from cvs_src_unpack
54cvs_fetch() { 77cvs_fetch() {
55 78
56 debug-print-function $FUNCNAME $* 79 debug-print-function $FUNCNAME $*
57 80
58 debug-print "$FUNCNAME: init: 81 debug-print "$FUNCNAME: init:
59ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 82ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
83ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS
60ECVS_TOP_DIR=$ECVS_TOP_DIR 84ECVS_TOP_DIR=$ECVS_TOP_DIR
61ECVS_SERVER=$ECVS_SERVER 85ECVS_SERVER=$ECVS_SERVER
86ECVS_ANON=$ECVS_ANON
62ECVS_USER=$ECVS_USER 87ECVS_USER=$ECVS_USER
63ECVS_PASS=$ECVS_PASS 88ECVS_PASS=$ECVS_PASS
64ECS_MODULE=$ECVS_MODULE 89ECS_MODULE=$ECVS_MODULE
65ECVS_MODULE_SUBDIR=$ECVS_SUBDIR 90ECVS_SUBDIR=$ECVS_SUBDIR
91ECVS_LOCAL=$ECVS_LOCAL
66DIR=$DIR" 92DIR=$DIR"
67 93
68 # a shorthand 94 # a shorthand
69 [ -n "$ECVS_SUBDIR" ] && DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" || \
70 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}" 95 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
71 96 debug-print "$FUNCNAME: now DIR=$DIR"
72 addread $DIR 97
73
74 if [ -z "$ECVS_SERVER" ]; then 98 if [ "$ECVS_SERVER" == "offline" ]; then
75 # we're not required to fetch anything, the module already exists and shouldn't be updated 99 # we're not required to fetch anything, the module already exists and shouldn't be updated
76 if [ -d "$DIR" ]; then 100 if [ -d "$DIR" ]; then
77 debug-print "$FUNCNAME: offline mode, exiting" 101 debug-print "$FUNCNAME: offline mode, exiting"
78 return 0 102 return 0
79 else 103 else
80 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting." 104 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting."
81 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error" 105 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
82 return 1 106 return 1
83 fi
84 fi 107 fi
108 fi
85 109
86 # disable the sandbox for this dir 110 # create target directory as needed
87
88 # not just $DIR because we want to create moduletopdir/CVS too
89 addwrite $ECVS_TOP_DIR/$ECVS_MODULE
90
91 if [ ! -d "$DIR" ]; then 111 if [ ! -d "$DIR" ]; then
92 debug-print "$FUNCNAME: creating cvs directory $DIR" 112 debug-print "$FUNCNAME: creating cvs directory $DIR"
93 einfo "Creating directory $DIR" 113 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
114 addwrite /foobar
115 addwrite /
94 mkdir -p /$DIR 116 mkdir -p "/$DIR"
117 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
95 fi 118 fi
96 119
120 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
121 # otherwise addwrite() doesn't work.
122 cd -P "$ECVS_TOP_DIR" > /dev/null
123 ECVS_TOP_DIR="`/bin/pwd`"
124 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
125 cd "$OLDPWD"
126
127 debug-print "$FUNCNAME: now DIR=$DIR"
128
129 # 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"
132
133 # add option for local (non-recursive) fetching
134 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
135
97 # prepare a cvspass file just for this session so that cvs thinks we're logged 136 # prepare a cvspass file just for this session so that cvs thinks we're logged
98 # in at the cvs server. we don't want to mess with ~/.cvspass. 137 # in at the cvs server. we don't want to mess with ~/.cvspass.
99 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass 138 echo ":pserver:${ECVS_SERVER} A" > "${T}/cvspass"
100 export CVS_PASSFILE="${T}/cvspass" 139 export CVS_PASSFILE="${T}/cvspass"
140 chown $ECVS_RUNAS "${T}/cvspass"
101 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER} 141 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
102 142
103 # Note: cvs update and checkout commands are unified. 143 # Note: cvs update and checkout commands are unified.
104 # we make sure a CVS/ dir exists in our module subdir with the right 144 # we make sure a CVS/ dir exists in our module subdir with the right
105 # Root and Repository entries in it and cvs update. 145 # Root and Repository entries in it and cvs update.
106 146
107 newserver=":pserver:anonymous@${ECVS_SERVER}" 147 [ "${ECVS_ANON}" == "yes" ] && \
148 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
149 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
150
108 151
109 # CVS/Repository files can't (I think) contain two concatenated slashes 152 # CVS/Repository files can't (I think) contain two concatenated slashes
110 if [ -n "$ECVS_SUBDIR" ]; then 153 if [ -n "$ECVS_SUBDIR" ]; then
111 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 154 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
112 else 155 else
113 repository="${ECVS_MODULE}" 156 repository="${ECVS_MODULE}"
114 fi 157 fi
115 158
116 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository" 159 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
117 160 debug-print "$FUNCNAME: entering directory $DIR"
118 cd $DIR 161 cd "/$DIR"
162
119 if [ ! -d "$DIR/CVS" ]; then 163 if [ ! -d "CVS" ]; then
120 # create a new CVS/ directory (checkout) 164 # create a new CVS/ directory (checkout)
121 debug-print "$FUNCNAME: creating new cvs directory" 165 debug-print "$FUNCNAME: creating new cvs directory"
122 166
123 mkdir CVS 167 mkdir CVS
124 echo $newserver > CVS/Root 168 echo $newserver > CVS/Root
… …
128 # if we're checking out a subdirectory only, create a CVS/ dir 172 # if we're checking out a subdirectory only, create a CVS/ dir
129 # in the module's top dir so that the user (and we) can cvs update 173 # in the module's top dir so that the user (and we) can cvs update
130 # from there to get the full module. 174 # from there to get the full module.
131 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then 175 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
132 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir" 176 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
133 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/ 177 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
134 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository 178 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
135 fi 179 fi
136 180
137 else 181 else
138 #update existing module 182 #update existing module
139 debug-print "$FUNCNAME: updating existing module/subdir" 183 debug-print "$FUNCNAME: updating existing module/subdir"
… …
153 debug-print "$cvsdirs" 197 debug-print "$cvsdirs"
154 198
155 einfo "Modifying CVS dirs..." 199 einfo "Modifying CVS dirs..."
156 for x in $cvsdirs; do 200 for x in $cvsdirs; do
157 debug-print "In $x" 201 debug-print "In $x"
158 echo $newserver > $x/Root 202 echo $newserver > "$x/Root"
159 done 203 done
160 204
161 fi 205 fi
162 206
163 fi 207 fi
164 208
209 # cvs auto-switches branches, how nice
210 # warning: if we do it this way we get multiple -rX options - harmless i think
211 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH"
212
213 # Chowning the directory
214 if [ "${ECVS_RUNAS}" != "`whoami`" ]; then
215 chown -R "$ECVS_RUNAS" "/$DIR"
216 fi
217
165 # finally run the cvs update command 218 # finally run the cvs update command
219 debug-print "$FUNCNAME: is in dir `/bin/pwd`"
166 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR" 220 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR"
167 einfo "Running $ECVS_CVS_COMMAND update with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..." 221 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..."
222
223 if [ "${ECVS_ANON}" == "no" ]; then
224
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
229 export CVS_RSH="/usr/bin/ssh"
230
231############################## inline-python #####################################
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
276 debug-print "$FUNCNAME: using anonymous cvs login"
168 $ECVS_CVS_COMMAND update -dP || die "died running cvs update" 277 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
278 fi
169 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"
170} 287}
171 288
172cvs_src_unpack() { 289cvs_src_unpack() {
173 290
174 debug-print-function $FUNCNAME $* 291 debug-print-function $FUNCNAME $*
175 cvs_fetch || die "died running cvs_fetch" 292 cvs_fetch || die "died running cvs_fetch"
176 293
177 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 294 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
178 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 295 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
179 # the reason this lives here and not in kde-source_src_unpack 296
180 # is that in the future after copying the sources we might need to 297 # probably redundant, but best to make sure
181 # delete them, so this has to be self-contained 298 mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
182 [ -n "$ECVS_SUBDIR" ] && cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR $WORKDIR \ 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
309 else
183 || cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR 310 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
184 311 fi
312 fi
313
314 # 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.
316 # still create the empty directory in workdir though.
317 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then
318 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
319 rm -rf "$DIR"
320 fi
321
185 # implement some of base_src_unpack's functionality; 322 # implement some of base_src_unpack's functionality;
186 # note however that base.eclass may not have been inherited! 323 # note however that base.eclass may not have been inherited!
187 if [ -n "$PATCHES" ]; then 324 if [ -n "$PATCHES" ]; then
188 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 325 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
189 cd $S 326 cd "$S"
190 for x in $PATCHES; do 327 for x in $PATCHES; do
191 debug-print "patching from $x" 328 debug-print "patching from $x"
192 patch -p0 < $x 329 patch -p0 < "$x"
193 done 330 done
194 fi 331 # make sure we don't try to apply patches more than once, since
332 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
333 export PATCHES=""
334 fi
195 335
196} 336}
197 337
198EXPORT_FUNCTIONS src_unpack 338EXPORT_FUNCTIONS src_unpack
199
200
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.31
  ViewVC Help
Powered by ViewVC 1.1.13