/[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.30
1# Copyright 1999-2000 Gentoo Technologies, Inc. 1# Copyright 1999-2000 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# Author Dan Armak <danarmak@gentoo.org> 3# 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 $ 4# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.30 2002/12/31 21:30:19 cretin Exp $
5# This eclass provides the generic cvs fetching functions. 5# This eclass provides the generic cvs fetching functions.
6 6
7ECLASS=cvs 7ECLASS=cvs
8INHERITED="$INHERITED $ECLASS" 8INHERITED="$INHERITED $ECLASS"
9 9
14# --- begin ebuild-configurable settings 14# --- begin ebuild-configurable settings
15 15
16# cvs command to run. you can set fex. "cvs -t" for extensive debug information 16# 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 17# 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. 18# the ~/.cvsrc config file and to use maximum compression.
19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -f -z4" 19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
20
21# cvs options given after the command (i.e. cvs update foo)
22# don't remove -dP or things won't work
23[ -z "$ECVS_CVS_OPTIONS" ] && ECVS_CVS_OPTIONS="-dP"
24
25# set this for the module/subdir to be fetched non-recursively
26#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
20 27
21# Where the cvs modules are stored/accessed 28# Where the cvs modules are stored/accessed
22[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="/usr/src" 29[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
23 30
24# Name of cvs server, set to "" to disable fetching 31# 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). 32# (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 33# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other
27# parts of the full CVSROOT (which looks like 34# parts of the full CVSROOT (which looks like
28# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 35# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
29# other settings 36# other settings
30[ -z "$ECVS_SERVER" ] && ECVS_SERVER="" 37[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
38
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"
44[ -z "$ECVS_AUTH" ] && ECVS_AUTH="ext"
45
46# Use su to run cvs as user
47[ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
31 48
32# Username to use 49# Username to use
33[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 50[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
34 51
35# Password to use (NOT (YET) SUPPORTED, because cvs doesn't store passwords in plaintext in .cvspass) 52# Password to use if anonymous login is off
36[ -z "$ECVS_PASS" ] && ECVS_PASS="" 53[ -z "$ECVS_PASS" ] && ECVS_PASS=""
37 54
38# Module to be fetched, must be set explicitly - 55# Module to be fetched, must be set explicitly -
39# I don't like the former ="$NP" default setting 56# I don't like the former ="$PN" default setting
40[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 57[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue"
58
59# Branch/tag to use, default is HEAD
60# uncomment the following line to enable the reset-branch-to-HEAD behaviour
61[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
41 62
42# Subdirectory in module to be fetched, default is not defined = whole module 63# 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! 64# DO NOT set default to "", if it's defined at all code will break!
44# don't uncomment following line! 65# don't uncomment following line!
45#[ -z "$ECVS_MODULE_SUBDIR" ] && ECVS_MODULE_SUBDIR="" 66#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR=""
46 67
47# --- end ebuild-configurable settings --- 68# --- end ebuild-configurable settings ---
48 69
49# add cvs to deps 70# add cvs to deps
50DEPEND="$DEPEND dev-util/cvs" 71DEPEND="$DEPEND dev-util/cvs dev-python/pexpect"
51 72
52# since we now longer have src_fetch as a redefinable ebuild function, 73# since we now longer have src_fetch as a redefinable ebuild function,
53# we are forced to call this function from cvs_src_unpack 74# we are forced to call this function from cvs_src_unpack
54cvs_fetch() { 75cvs_fetch() {
55 76
56 debug-print-function $FUNCNAME $* 77 debug-print-function $FUNCNAME $*
57 78
58 debug-print "$FUNCNAME: init: 79 debug-print "$FUNCNAME: init:
59ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 80ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
81ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS
60ECVS_TOP_DIR=$ECVS_TOP_DIR 82ECVS_TOP_DIR=$ECVS_TOP_DIR
61ECVS_SERVER=$ECVS_SERVER 83ECVS_SERVER=$ECVS_SERVER
84ECVS_ANON=$ECVS_ANON
62ECVS_USER=$ECVS_USER 85ECVS_USER=$ECVS_USER
63ECVS_PASS=$ECVS_PASS 86ECVS_PASS=$ECVS_PASS
64ECS_MODULE=$ECVS_MODULE 87ECS_MODULE=$ECVS_MODULE
65ECVS_MODULE_SUBDIR=$ECVS_SUBDIR 88ECVS_SUBDIR=$ECVS_SUBDIR
89ECVS_LOCAL=$ECVS_LOCAL
66DIR=$DIR" 90DIR=$DIR"
67 91
68 # a shorthand 92 # a shorthand
69 [ -n "$ECVS_SUBDIR" ] && DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" || \
70 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}" 93 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
71 94 debug-print "$FUNCNAME: now DIR=$DIR"
72 addread $DIR 95
73
74 if [ -z "$ECVS_SERVER" ]; then 96 if [ "$ECVS_SERVER" == "offline" ]; then
75 # we're not required to fetch anything, the module already exists and shouldn't be updated 97 # we're not required to fetch anything, the module already exists and shouldn't be updated
76 if [ -d "$DIR" ]; then 98 if [ -d "$DIR" ]; then
77 debug-print "$FUNCNAME: offline mode, exiting" 99 debug-print "$FUNCNAME: offline mode, exiting"
78 return 0 100 return 0
79 else 101 else
80 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting." 102 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" 103 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
82 return 1 104 return 1
83 fi
84 fi 105 fi
106 fi
85 107
86 # disable the sandbox for this dir 108 # 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 109 if [ ! -d "$DIR" ]; then
92 debug-print "$FUNCNAME: creating cvs directory $DIR" 110 debug-print "$FUNCNAME: creating cvs directory $DIR"
93 einfo "Creating directory $DIR" 111 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
112 addwrite /foobar
113 addwrite /
94 mkdir -p /$DIR 114 mkdir -p "/$DIR"
115 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
95 fi 116 fi
96 117
118 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
119 # otherwise addwrite() doesn't work.
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
131 # add option for local (non-recursive) fetching
132 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
133
97 # prepare a cvspass file just for this session so that cvs thinks we're logged 134 # 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. 135 # in at the cvs server. we don't want to mess with ~/.cvspass.
99 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass 136 echo ":pserver:${ECVS_SERVER} A" > "${T}/cvspass"
100 export CVS_PASSFILE="${T}/cvspass" 137 export CVS_PASSFILE="${T}/cvspass"
138 chown $ECVS_RUNAS "${T}/cvspass"
101 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER} 139 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
102 140
103 # Note: cvs update and checkout commands are unified. 141 # Note: cvs update and checkout commands are unified.
104 # we make sure a CVS/ dir exists in our module subdir with the right 142 # we make sure a CVS/ dir exists in our module subdir with the right
105 # Root and Repository entries in it and cvs update. 143 # Root and Repository entries in it and cvs update.
106 144
107 newserver=":pserver:anonymous@${ECVS_SERVER}" 145 [ "${ECVS_ANON}" == "yes" ] && \
146 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
147 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
148
108 149
109 # CVS/Repository files can't (I think) contain two concatenated slashes 150 # CVS/Repository files can't (I think) contain two concatenated slashes
110 if [ -n "$ECVS_SUBDIR" ]; then 151 if [ -n "$ECVS_SUBDIR" ]; then
111 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 152 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
112 else 153 else
113 repository="${ECVS_MODULE}" 154 repository="${ECVS_MODULE}"
114 fi 155 fi
115 156
116 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository" 157 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
117 158 debug-print "$FUNCNAME: entering directory $DIR"
118 cd $DIR 159 cd "/$DIR"
160
119 if [ ! -d "$DIR/CVS" ]; then 161 if [ ! -d "CVS" ]; then
120 # create a new CVS/ directory (checkout) 162 # create a new CVS/ directory (checkout)
121 debug-print "$FUNCNAME: creating new cvs directory" 163 debug-print "$FUNCNAME: creating new cvs directory"
122 164
123 mkdir CVS 165 mkdir CVS
124 echo $newserver > CVS/Root 166 echo $newserver > CVS/Root
128 # if we're checking out a subdirectory only, create a CVS/ dir 170 # 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 171 # in the module's top dir so that the user (and we) can cvs update
130 # from there to get the full module. 172 # from there to get the full module.
131 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then 173 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
132 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir" 174 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
133 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/ 175 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
134 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository 176 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
135 fi 177 fi
136 178
137 else 179 else
138 #update existing module 180 #update existing module
139 debug-print "$FUNCNAME: updating existing module/subdir" 181 debug-print "$FUNCNAME: updating existing module/subdir"
153 debug-print "$cvsdirs" 195 debug-print "$cvsdirs"
154 196
155 einfo "Modifying CVS dirs..." 197 einfo "Modifying CVS dirs..."
156 for x in $cvsdirs; do 198 for x in $cvsdirs; do
157 debug-print "In $x" 199 debug-print "In $x"
158 echo $newserver > $x/Root 200 echo $newserver > "$x/Root"
159 done 201 done
160 202
161 fi 203 fi
162 204
163 fi 205 fi
164 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}" != "`whoami`" ]; then
213 chown -R "$ECVS_RUNAS" "/$DIR"
214 fi
215
165 # finally run the cvs update command 216 # finally run the cvs update command
217 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" 218 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..." 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 "${ECVS_RUNAS}" == "`whoami`":
239 mycommand = "${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}"
240else:
241 mycommand = "su ${ECVS_RUNAS} -c \"${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}\""
242
243if myauth == "ext":
244 child = pexpect.spawn(mycommand)
245
246 index = child.expect(['continue connecting','word:'], mytimeout)
247 if index == 0:
248 child.sendline('yes')
249 ## Added server to ~/.ssh/known_hosts
250 child.expect('word:', mytimeout)
251 else:
252 ## Server already is in ~/.ssh/known_hosts
253 pass
254
255 child.sendline(mypasswd)
256 child.expect(pexpect.EOF)
257
258elif myauth == "pserver":
259 if "${ECVS_RUNAS}" == "`whoami`":
260 mycommand2 = "cvs login"
261 else:
262 mycommand2 = "su ${ECVS_RUNAS} -c \"cvs login\""
263 child = pexpect.spawn(mycommand2)
264 child.expect("CVS password:",mytimeout)
265 child.sendline(mypasswd)
266 child.expect(pexpect.EOF)
267
268 # Logged in - checking out
269 os.system(mycommand)
270
271EndOfFile
272########################### End of inline-python ##################################
273 else
274 debug-print "$FUNCNAME: using anonymous cvs login"
168 $ECVS_CVS_COMMAND update -dP || die "died running cvs update" 275 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
276 fi
169 277
278 # log out and restore ownership
279 if [ "$ECVS_RUNAS" == "`whoami`" ]; then
280 cvs logout &> /dev/null
281 else
282 su $ECVS_RUNAS -c "cvs logout" &> /dev/null
283 fi
284 chown `whoami` "${T}/cvspass"
170} 285}
171 286
172cvs_src_unpack() { 287cvs_src_unpack() {
173 288
174 debug-print-function $FUNCNAME $* 289 debug-print-function $FUNCNAME $*
175 cvs_fetch || die "died running cvs_fetch" 290 cvs_fetch || die "died running cvs_fetch"
176 291
177 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 292 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
178 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 293 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 294
180 # is that in the future after copying the sources we might need to 295 # probably redundant, but best to make sure
181 # delete them, so this has to be self-contained 296 mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
182 [ -n "$ECVS_SUBDIR" ] && cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR $WORKDIR \ 297
298 if [ -n "$ECVS_SUBDIR" ]; then
299 if [ -n "$ECVS_LOCAL" ]; then
300 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR"/* "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
301 else
302 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
303 fi
304 else
305 if [ -n "$ECVS_LOCAL" ]; then
306 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE"/* $WORKDIR/$ECVS_MODULE
307 else
183 || cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR 308 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
184 309 fi
310 fi
311
312 # if the directory is empty, remove it; empty directories cannot exist in cvs.
313 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
314 # still create the empty directory in workdir though.
315 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then
316 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
317 rm -rf "$DIR"
318 fi
319
185 # implement some of base_src_unpack's functionality; 320 # implement some of base_src_unpack's functionality;
186 # note however that base.eclass may not have been inherited! 321 # note however that base.eclass may not have been inherited!
187 if [ -n "$PATCHES" ]; then 322 if [ -n "$PATCHES" ]; then
188 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 323 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
189 cd $S 324 cd "$S"
190 for x in $PATCHES; do 325 for x in $PATCHES; do
191 debug-print "patching from $x" 326 debug-print "patching from $x"
192 patch -p0 < $x 327 patch -p0 < "$x"
193 done 328 done
194 fi 329 # make sure we don't try to apply patches more than once, since
330 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
331 export PATCHES=""
332 fi
195 333
196} 334}
197 335
198EXPORT_FUNCTIONS src_unpack 336EXPORT_FUNCTIONS src_unpack
199
200

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.30

  ViewVC Help
Powered by ViewVC 1.1.20