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

Diff of /eclass/cvs.eclass

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

Revision 1.18 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.18 2002/09/15 14:15:54 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
43[ -z "$ECVS_PASS" ] && ECVS_PASS="" 55[ -z "$ECVS_PASS" ] && ECVS_PASS=""
44 56
45# Module to be fetched, must be set explicitly - 57# Module to be fetched, must be set explicitly -
46# I don't like the former ="$PN" default setting 58# I don't like the former ="$PN" default setting
47[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue" 59[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue"
56#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR="" 68#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR=""
57 69
58# --- end ebuild-configurable settings --- 70# --- end ebuild-configurable settings ---
59 71
60# add cvs to deps 72# add cvs to deps
61DEPEND="$DEPEND dev-util/cvs" 73DEPEND="$DEPEND dev-util/cvs dev-python/pexpect"
62 74
63# 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,
64# we are forced to call this function from cvs_src_unpack 76# we are forced to call this function from cvs_src_unpack
65cvs_fetch() { 77cvs_fetch() {
66 78
69 debug-print "$FUNCNAME: init: 81 debug-print "$FUNCNAME: init:
70ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 82ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
71ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 83ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS
72ECVS_TOP_DIR=$ECVS_TOP_DIR 84ECVS_TOP_DIR=$ECVS_TOP_DIR
73ECVS_SERVER=$ECVS_SERVER 85ECVS_SERVER=$ECVS_SERVER
86ECVS_ANON=$ECVS_ANON
74ECVS_USER=$ECVS_USER 87ECVS_USER=$ECVS_USER
75ECVS_PASS=$ECVS_PASS 88ECVS_PASS=$ECVS_PASS
76ECS_MODULE=$ECVS_MODULE 89ECS_MODULE=$ECVS_MODULE
77ECVS_SUBDIR=$ECVS_SUBDIR 90ECVS_SUBDIR=$ECVS_SUBDIR
78ECVS_LOCAL=$ECVS_LOCAL 91ECVS_LOCAL=$ECVS_LOCAL
82 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 95 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
83 debug-print "$FUNCNAME: now DIR=$DIR" 96 debug-print "$FUNCNAME: now DIR=$DIR"
84 97
85 if [ "$ECVS_SERVER" == "offline" ]; then 98 if [ "$ECVS_SERVER" == "offline" ]; then
86 # 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
87 if [ -d "$DIR" ]; then 100 if [ -d "$DIR" ]; then
88 debug-print "$FUNCNAME: offline mode, exiting" 101 debug-print "$FUNCNAME: offline mode, exiting"
89 return 0 102 return 0
90 else 103 else
91 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting." 104 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" 105 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
93 return 1 106 return 1
94 fi 107 fi
95 fi 108 fi
96 109
97 # create target directory as needed 110 # create target directory as needed
98 if [ ! -d "$DIR" ]; then 111 if [ ! -d "$DIR" ]; then
99 debug-print "$FUNCNAME: creating cvs directory $DIR" 112 debug-print "$FUNCNAME: creating cvs directory $DIR"
100 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/" 113 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
101 addwrite /foobar 114 addwrite /foobar
102 addwrite / 115 addwrite /
103 mkdir -p /$DIR 116 mkdir -p "/$DIR"
104 export SANDBOX_WRITE=${SANDBOX_WRITE//:\/foobar:\/} 117 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
105 fi 118 fi
106 119
107 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path, 120 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
108 # otherwise addwrite() doesn't work. 121 # otherwise addwrite() doesn't work.
109 cd -P $ECVS_TOP_DIR > /dev/null 122 cd -P "$ECVS_TOP_DIR" > /dev/null
110 ECVS_TOP_DIR="`/bin/pwd`" 123 ECVS_TOP_DIR="`/bin/pwd`"
111 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 124 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
112 cd $OLDPWD 125 cd "$OLDPWD"
113 126
114 debug-print "$FUNCNAME: now DIR=$DIR" 127 debug-print "$FUNCNAME: now DIR=$DIR"
115 128
116 # disable the sandbox for this dir 129 # disable the sandbox for this dir
117 # not just $DIR because we want to create moduletopdir/CVS too 130 # not just $DIR because we want to create moduletopdir/CVS too
118 addwrite $ECVS_TOP_DIR/$ECVS_MODULE 131 addwrite "$ECVS_TOP_DIR/$ECVS_MODULE"
119 132
120 # add option for local (non-recursive) fetching 133 # add option for local (non-recursive) fetching
121 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 134 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
122 135
123 # 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
124 # 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.
125 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass 138 echo ":pserver:${ECVS_SERVER} A" > "${T}/cvspass"
126 export CVS_PASSFILE="${T}/cvspass" 139 export CVS_PASSFILE="${T}/cvspass"
140 chown $ECVS_RUNAS "${T}/cvspass"
127 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER} 141 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
128 142
129 # Note: cvs update and checkout commands are unified. 143 # Note: cvs update and checkout commands are unified.
130 # 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
131 # Root and Repository entries in it and cvs update. 145 # Root and Repository entries in it and cvs update.
132 146
147 [ "${ECVS_ANON}" == "yes" ] && \
133 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" 148 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
149 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
150
134 151
135 # CVS/Repository files can't (I think) contain two concatenated slashes 152 # CVS/Repository files can't (I think) contain two concatenated slashes
136 if [ -n "$ECVS_SUBDIR" ]; then 153 if [ -n "$ECVS_SUBDIR" ]; then
137 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 154 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
138 else 155 else
139 repository="${ECVS_MODULE}" 156 repository="${ECVS_MODULE}"
140 fi 157 fi
141 158
142 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository" 159 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
143 debug-print "$FUNCNAME: entering directory $DIR" 160 debug-print "$FUNCNAME: entering directory $DIR"
144 cd /$DIR 161 cd "/$DIR"
145 162
146 if [ ! -d "CVS" ]; then 163 if [ ! -d "CVS" ]; then
147 # create a new CVS/ directory (checkout) 164 # create a new CVS/ directory (checkout)
148 debug-print "$FUNCNAME: creating new cvs directory" 165 debug-print "$FUNCNAME: creating new cvs directory"
149 166
155 # 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
156 # 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
157 # from there to get the full module. 174 # from there to get the full module.
158 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then 175 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
159 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir" 176 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
160 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/ 177 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
161 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository 178 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
162 fi 179 fi
163 180
164 else 181 else
165 #update existing module 182 #update existing module
166 debug-print "$FUNCNAME: updating existing module/subdir" 183 debug-print "$FUNCNAME: updating existing module/subdir"
180 debug-print "$cvsdirs" 197 debug-print "$cvsdirs"
181 198
182 einfo "Modifying CVS dirs..." 199 einfo "Modifying CVS dirs..."
183 for x in $cvsdirs; do 200 for x in $cvsdirs; do
184 debug-print "In $x" 201 debug-print "In $x"
185 echo $newserver > $x/Root 202 echo $newserver > "$x/Root"
186 done 203 done
187 204
188 fi 205 fi
189 206
190 fi 207 fi
191 208
192 # cvs auto-switches branches, how nice 209 # cvs auto-switches branches, how nice
193 # warning: if we do it this way we get multiple -rX options - harmless i think 210 # 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" 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
195 217
196 # finally run the cvs update command 218 # finally run the cvs update command
197 debug-print "$FUNCNAME: is in dir `/bin/pwd`" 219 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" 220 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..." 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"
200 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update" 277 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
278 fi
201 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"
202} 287}
203 288
204cvs_src_unpack() { 289cvs_src_unpack() {
205 290
206 debug-print-function $FUNCNAME $* 291 debug-print-function $FUNCNAME $*
207 cvs_fetch || die "died running cvs_fetch" 292 cvs_fetch || die "died running cvs_fetch"
208 293
209 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 294 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
210 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..."
296
297 # probably redundant, but best to make sure
298 mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
211 299
212 if [ -n "$ECVS_SUBDIR" ]; then 300 if [ -n "$ECVS_SUBDIR" ]; then
213 mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR
214 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/
215 else
216 if [ -n "$ECVS_LOCAL" ]; then 301 if [ -n "$ECVS_LOCAL" ]; then
217 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE 302 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR"/* "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
218 else 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
219 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR 310 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
220 fi 311 fi
221 fi 312 fi
222 313
223 # if the directory is empty, remove it; empty directories cannot exist in cvs. 314 # if the directory is empty, remove it; empty directories cannot exist in cvs.
224 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist. 315 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
225 # still create the empty directory in workdir though. 316 # still create the empty directory in workdir though.
226 if [ "`ls -A $DIR`" == "CVS" ]; then 317 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then
227 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR" 318 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
228 rm -rf $DIR 319 rm -rf "$DIR"
229 fi 320 fi
230 321
231 # implement some of base_src_unpack's functionality; 322 # implement some of base_src_unpack's functionality;
232 # note however that base.eclass may not have been inherited! 323 # note however that base.eclass may not have been inherited!
233 if [ -n "$PATCHES" ]; then 324 if [ -n "$PATCHES" ]; then
234 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 325 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
235 cd $S 326 cd "$S"
236 for x in $PATCHES; do 327 for x in $PATCHES; do
237 debug-print "patching from $x" 328 debug-print "patching from $x"
238 patch -p0 < $x 329 patch -p0 < "$x"
239 done 330 done
240 # make sure we don't try to apply patches more than once, since 331 # make sure we don't try to apply patches more than once, since
241 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack 332 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
242 export PATCHES="" 333 export PATCHES=""
243 fi 334 fi
244 335
245} 336}
246 337
247EXPORT_FUNCTIONS src_unpack 338EXPORT_FUNCTIONS src_unpack
248
249

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.31

  ViewVC Help
Powered by ViewVC 1.1.20