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

Diff of /eclass/cvs.eclass

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

Revision 1.20 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.20 2002/09/22 18:43:20 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
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"
56#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR="" 69#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR=""
57 70
58# --- end ebuild-configurable settings --- 71# --- end ebuild-configurable settings ---
59 72
60# add cvs to deps 73# add cvs to deps
61DEPEND="$DEPEND dev-util/cvs" 74DEPEND="$DEPEND dev-util/cvs dev-python/pexpect"
62 75
63# 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,
64# we are forced to call this function from cvs_src_unpack 77# we are forced to call this function from cvs_src_unpack
65cvs_fetch() { 78cvs_fetch() {
66 79
67 debug-print-function $FUNCNAME $* 80 debug-print-function $FUNCNAME $*
68 81
69 debug-print "$FUNCNAME: init: 82 debug-print "$FUNCNAME: init:
70ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 839ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
71ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 84ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS
72ECVS_TOP_DIR=$ECVS_TOP_DIR 85ECVS_TOP_DIR=$ECVS_TOP_DIR
73ECVS_SERVER=$ECVS_SERVER 86ECVS_SERVER=$ECVS_SERVER
87ECVS_ANON=$ECVS_ANON
74ECVS_USER=$ECVS_USER 88ECVS_USER=$ECVS_USER
75ECVS_PASS=$ECVS_PASS 89ECVS_PASS=$ECVS_PASS
76ECS_MODULE=$ECVS_MODULE 90ECS_MODULE=$ECVS_MODULE
77ECVS_SUBDIR=$ECVS_SUBDIR 91ECVS_SUBDIR=$ECVS_SUBDIR
78ECVS_LOCAL=$ECVS_LOCAL 92ECVS_LOCAL=$ECVS_LOCAL
82 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 96 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
83 debug-print "$FUNCNAME: now DIR=$DIR" 97 debug-print "$FUNCNAME: now DIR=$DIR"
84 98
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 108 fi
95 fi 109 fi
96 110
97 # create target directory as needed 111 # create target directory as needed
98 if [ ! -d "$DIR" ]; then 112 if [ ! -d "$DIR" ]; then
99 debug-print "$FUNCNAME: creating cvs directory $DIR" 113 debug-print "$FUNCNAME: creating cvs directory $DIR"
100 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/" 114 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
101 addwrite /foobar 115 addwrite /foobar
102 addwrite / 116 addwrite /
103 mkdir -p /$DIR 117 mkdir -p "/$DIR"
104 export SANDBOX_WRITE=${SANDBOX_WRITE//:\/foobar:\/} 118 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
105 fi 119 fi
106 120
107 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path, 121 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
108 # otherwise addwrite() doesn't work. 122 # otherwise addwrite() doesn't work.
109 cd -P $ECVS_TOP_DIR > /dev/null 123 cd -P "$ECVS_TOP_DIR" > /dev/null
110 ECVS_TOP_DIR="`/bin/pwd`" 124 ECVS_TOP_DIR="`/bin/pwd`"
111 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 125 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
112 cd $OLDPWD 126 cd "$OLDPWD"
113 127
114 debug-print "$FUNCNAME: now DIR=$DIR" 128 debug-print "$FUNCNAME: now DIR=$DIR"
115 129
116 # disable the sandbox for this dir 130 # disable the sandbox for this dir
117 # not just $DIR because we want to create moduletopdir/CVS too 131 # not just $DIR because we want to create moduletopdir/CVS too
118 addwrite $ECVS_TOP_DIR/$ECVS_MODULE 132 addwrite "$ECVS_TOP_DIR/$ECVS_MODULE"
119 133
120 # add option for local (non-recursive) fetching 134 # add option for local (non-recursive) fetching
121 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 135 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
122 136
123 # prepare a cvspass file just for this session so that cvs thinks we're logged 137 # prepare a cvspass file just for this session, we don't want to mess with ~/.cvspass
124 # in at the cvs server. we don't want to mess with ~/.cvspass. 138 touch "${T}/cvspass"
125 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass
126 export CVS_PASSFILE="${T}/cvspass" 139 export CVS_PASSFILE="${T}/cvspass"
127 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER} 140 chown $ECVS_RUNAS "${T}/cvspass"
128 141
129 # Note: cvs update and checkout commands are unified. 142 # Note: cvs update and checkout commands are unified.
130 # 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
131 # Root and Repository entries in it and cvs update. 144 # Root and Repository entries in it and cvs update.
132 145
146 [ "${ECVS_ANON}" == "yes" ] && \
133 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" 147 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
148 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
149
134 150
135 # CVS/Repository files can't (I think) contain two concatenated slashes 151 # CVS/Repository files can't (I think) contain two concatenated slashes
136 if [ -n "$ECVS_SUBDIR" ]; then 152 if [ -n "$ECVS_SUBDIR" ]; then
137 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 153 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
138 else 154 else
139 repository="${ECVS_MODULE}" 155 repository="${ECVS_MODULE}"
140 fi 156 fi
141 157
142 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository" 158 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
143 debug-print "$FUNCNAME: entering directory $DIR" 159 debug-print "$FUNCNAME: entering directory $DIR"
144 cd /$DIR 160 cd "/$DIR"
145 161
146 if [ ! -d "CVS" ]; then 162 if [ ! -d "CVS" ]; then
147 # create a new CVS/ directory (checkout) 163 # create a new CVS/ directory (checkout)
148 debug-print "$FUNCNAME: creating new cvs directory" 164 debug-print "$FUNCNAME: creating new cvs directory"
149 165
155 # 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
156 # 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
157 # from there to get the full module. 173 # from there to get the full module.
158 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then 174 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
159 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir" 175 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
160 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/ 176 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
161 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository 177 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
162 fi 178 fi
163 179
164 else 180 else
165 #update existing module 181 #update existing module
166 debug-print "$FUNCNAME: updating existing module/subdir" 182 debug-print "$FUNCNAME: updating existing module/subdir"
180 debug-print "$cvsdirs" 196 debug-print "$cvsdirs"
181 197
182 einfo "Modifying CVS dirs..." 198 einfo "Modifying CVS dirs..."
183 for x in $cvsdirs; do 199 for x in $cvsdirs; do
184 debug-print "In $x" 200 debug-print "In $x"
185 echo $newserver > $x/Root 201 echo $newserver > "$x/Root"
186 done 202 done
187 203
188 fi 204 fi
189 205
190 fi 206 fi
191 207
192 # cvs auto-switches branches, how nice 208 # cvs auto-switches branches, how nice
193 # warning: if we do it this way we get multiple -rX options - harmless i think 209 # warning: if we do it this way we get multiple -rX options - harmless i think
194 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH" 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
195 216
196 # finally run the cvs update command 217 # finally run the cvs update command
197 debug-print "$FUNCNAME: is in dir `/bin/pwd`" 218 debug-print "$FUNCNAME: is in dir `/bin/pwd`"
198 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"
199 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"
200 $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"
201 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"
202} 328}
203 329
204cvs_src_unpack() { 330cvs_src_unpack() {
205 331
206 debug-print-function $FUNCNAME $* 332 debug-print-function $FUNCNAME $*
207 cvs_fetch || die "died running cvs_fetch" 333 cvs_fetch || die "died running cvs_fetch"
208 334
209 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..." 335 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
210 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..." 336 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
211 337
212 # probably redundant, but best to make sure 338 # probably redundant, but best to make sure
213 mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR 339 mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
214 340
215 if [ -n "$ECVS_SUBDIR" ]; then 341 if [ -n "$ECVS_SUBDIR" ]; then
216 if [ -n "$ECVS_LOCAL" ]; then 342 if [ -n "$ECVS_LOCAL" ]; then
217 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR 343 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR"/* "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
218 else 344 else
219 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.. 345 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
220 fi 346 fi
221 else 347 else
222 if [ -n "$ECVS_LOCAL" ]; then 348 if [ -n "$ECVS_LOCAL" ]; then
223 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE 349 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE"/* $WORKDIR/$ECVS_MODULE
224 else 350 else
225 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR 351 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
226 fi 352 fi
227 fi 353 fi
228 354
229 # if the directory is empty, remove it; empty directories cannot exist in cvs. 355 # if the directory is empty, remove it; empty directories cannot exist in cvs.
230 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist. 356 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
231 # still create the empty directory in workdir though. 357 # still create the empty directory in workdir though.
232 if [ "`ls -A $DIR`" == "CVS" ]; then 358 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then
233 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR" 359 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
234 rm -rf $DIR 360 rm -rf "$DIR"
235 fi 361 fi
236 362
237 # implement some of base_src_unpack's functionality; 363 # implement some of base_src_unpack's functionality;
238 # note however that base.eclass may not have been inherited! 364 # note however that base.eclass may not have been inherited!
239 if [ -n "$PATCHES" ]; then 365 if [ -n "$PATCHES" ]; then
240 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 366 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
241 cd $S 367 cd "$S"
242 for x in $PATCHES; do 368 for x in $PATCHES; do
243 debug-print "patching from $x" 369 debug-print "patching from $x"
244 patch -p0 < $x 370 patch -p0 < "$x"
245 done 371 done
246 # make sure we don't try to apply patches more than once, since 372 # make sure we don't try to apply patches more than once, since
247 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack 373 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
248 export PATCHES="" 374 export PATCHES=""
249 fi 375 fi
250 376
251} 377}
252 378
253EXPORT_FUNCTIONS src_unpack 379EXPORT_FUNCTIONS src_unpack
254
255

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

  ViewVC Help
Powered by ViewVC 1.1.20