/[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.26
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.18 2002/09/15 14:15:54 danarmak Exp $ 4# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.26 2002/11/23 21:37:40 danarmak 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
34# parts of the full CVSROOT (which looks like 34# parts of the full CVSROOT (which looks like
35# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 35# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
36# other settings 36# other settings
37[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 37[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
38 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`"
48
39# Username to use 49# Username to use
40[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 50[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
41 51
42# 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
43[ -z "$ECVS_PASS" ] && ECVS_PASS="" 53[ -z "$ECVS_PASS" ] && ECVS_PASS=""
44 54
45# Module to be fetched, must be set explicitly - 55# Module to be fetched, must be set explicitly -
46# I don't like the former ="$PN" default setting 56# I don't like the former ="$PN" default setting
47[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue" 57[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue"
56#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR="" 66#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR=""
57 67
58# --- end ebuild-configurable settings --- 68# --- end ebuild-configurable settings ---
59 69
60# add cvs to deps 70# add cvs to deps
61DEPEND="$DEPEND dev-util/cvs" 71DEPEND="$DEPEND dev-util/cvs dev-python/pexpect"
62 72
63# 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,
64# we are forced to call this function from cvs_src_unpack 74# we are forced to call this function from cvs_src_unpack
65cvs_fetch() { 75cvs_fetch() {
66 76
69 debug-print "$FUNCNAME: init: 79 debug-print "$FUNCNAME: init:
70ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 80ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
71ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 81ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS
72ECVS_TOP_DIR=$ECVS_TOP_DIR 82ECVS_TOP_DIR=$ECVS_TOP_DIR
73ECVS_SERVER=$ECVS_SERVER 83ECVS_SERVER=$ECVS_SERVER
84ECVS_ANON=$ECVS_ANON
74ECVS_USER=$ECVS_USER 85ECVS_USER=$ECVS_USER
75ECVS_PASS=$ECVS_PASS 86ECVS_PASS=$ECVS_PASS
76ECS_MODULE=$ECVS_MODULE 87ECS_MODULE=$ECVS_MODULE
77ECVS_SUBDIR=$ECVS_SUBDIR 88ECVS_SUBDIR=$ECVS_SUBDIR
78ECVS_LOCAL=$ECVS_LOCAL 89ECVS_LOCAL=$ECVS_LOCAL
82 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 93 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
83 debug-print "$FUNCNAME: now DIR=$DIR" 94 debug-print "$FUNCNAME: now DIR=$DIR"
84 95
85 if [ "$ECVS_SERVER" == "offline" ]; then 96 if [ "$ECVS_SERVER" == "offline" ]; then
86 # 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
87 if [ -d "$DIR" ]; then 98 if [ -d "$DIR" ]; then
88 debug-print "$FUNCNAME: offline mode, exiting" 99 debug-print "$FUNCNAME: offline mode, exiting"
89 return 0 100 return 0
90 else 101 else
91 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting." 102 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" 103 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
93 return 1 104 return 1
94 fi 105 fi
95 fi 106 fi
96 107
97 # create target directory as needed 108 # create target directory as needed
98 if [ ! -d "$DIR" ]; then 109 if [ ! -d "$DIR" ]; then
99 debug-print "$FUNCNAME: creating cvs directory $DIR" 110 debug-print "$FUNCNAME: creating cvs directory $DIR"
100 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/" 111 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
101 addwrite /foobar 112 addwrite /foobar
102 addwrite / 113 addwrite /
103 mkdir -p /$DIR 114 mkdir -p "/$DIR"
104 export SANDBOX_WRITE=${SANDBOX_WRITE//:\/foobar:\/} 115 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
105 fi 116 fi
106 117
107 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path, 118 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
108 # otherwise addwrite() doesn't work. 119 # otherwise addwrite() doesn't work.
109 cd -P $ECVS_TOP_DIR > /dev/null 120 cd -P "$ECVS_TOP_DIR" > /dev/null
110 ECVS_TOP_DIR="`/bin/pwd`" 121 ECVS_TOP_DIR="`/bin/pwd`"
111 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 122 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
112 cd $OLDPWD 123 cd "$OLDPWD"
113 124
114 debug-print "$FUNCNAME: now DIR=$DIR" 125 debug-print "$FUNCNAME: now DIR=$DIR"
115 126
116 # disable the sandbox for this dir 127 # disable the sandbox for this dir
117 # not just $DIR because we want to create moduletopdir/CVS too 128 # not just $DIR because we want to create moduletopdir/CVS too
118 addwrite $ECVS_TOP_DIR/$ECVS_MODULE 129 addwrite "$ECVS_TOP_DIR/$ECVS_MODULE"
119 130
120 # add option for local (non-recursive) fetching 131 # add option for local (non-recursive) fetching
121 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 132 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
122 133
123 # 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
124 # 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.
125 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass 136 echo ":pserver:${ECVS_SERVER} A" > "${T}/cvspass"
126 export CVS_PASSFILE="${T}/cvspass" 137 export CVS_PASSFILE="${T}/cvspass"
138 chown $ECVS_RUNAS "${T}/cvspass"
127 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER} 139 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
128 140
129 # Note: cvs update and checkout commands are unified. 141 # Note: cvs update and checkout commands are unified.
130 # 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
131 # Root and Repository entries in it and cvs update. 143 # Root and Repository entries in it and cvs update.
132 144
145 [ "${ECVS_ANON}" == "yes" ] && \
133 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" 146 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
147 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
148
134 149
135 # CVS/Repository files can't (I think) contain two concatenated slashes 150 # CVS/Repository files can't (I think) contain two concatenated slashes
136 if [ -n "$ECVS_SUBDIR" ]; then 151 if [ -n "$ECVS_SUBDIR" ]; then
137 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 152 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
138 else 153 else
139 repository="${ECVS_MODULE}" 154 repository="${ECVS_MODULE}"
140 fi 155 fi
141 156
142 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository" 157 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
143 debug-print "$FUNCNAME: entering directory $DIR" 158 debug-print "$FUNCNAME: entering directory $DIR"
144 cd /$DIR 159 cd "/$DIR"
145 160
146 if [ ! -d "CVS" ]; then 161 if [ ! -d "CVS" ]; then
147 # create a new CVS/ directory (checkout) 162 # create a new CVS/ directory (checkout)
148 debug-print "$FUNCNAME: creating new cvs directory" 163 debug-print "$FUNCNAME: creating new cvs directory"
149 164
155 # 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
156 # 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
157 # from there to get the full module. 172 # from there to get the full module.
158 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then 173 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
159 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir" 174 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
160 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/ 175 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
161 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository 176 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
162 fi 177 fi
163 178
164 else 179 else
165 #update existing module 180 #update existing module
166 debug-print "$FUNCNAME: updating existing module/subdir" 181 debug-print "$FUNCNAME: updating existing module/subdir"
180 debug-print "$cvsdirs" 195 debug-print "$cvsdirs"
181 196
182 einfo "Modifying CVS dirs..." 197 einfo "Modifying CVS dirs..."
183 for x in $cvsdirs; do 198 for x in $cvsdirs; do
184 debug-print "In $x" 199 debug-print "In $x"
185 echo $newserver > $x/Root 200 echo $newserver > "$x/Root"
186 done 201 done
187 202
188 fi 203 fi
189 204
190 fi 205 fi
191 206
192 # cvs auto-switches branches, how nice 207 # cvs auto-switches branches, how nice
193 # warning: if we do it this way we get multiple -rX options - harmless i think 208 # 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" 209 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH"
210
211 # Chowning the directory
212 if [ "${ECVS_RUNAS}" != "root" ]; then
213 chown -R "$ECVS_RUNAS" "/$DIR"
214 fi
195 215
196 # finally run the cvs update command 216 # finally run the cvs update command
197 debug-print "$FUNCNAME: is in dir `/bin/pwd`" 217 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" 218 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..." 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 myauth == "ext":
239 mycommand = "su ${ECVS_RUNAS} -c \"${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}\""
240 child = pexpect.spawn(mycommand)
241
242 index = child.expect(['continue connecting','word:'], mytimeout)
243 if index == 0:
244 child.sendline('yes')
245 ## Added server to ~/.ssh/known_hosts
246 child.expect('word:', mytimeout)
247 else:
248 ## Server already is in ~/.ssh/known_hosts
249 pass
250
251 child.sendline(mypasswd)
252 child.expect(pexpect.EOF)
253
254elif myauth == "pserver":
255 mycommand = "su ${ECVS_RUNAS} -c \"cvs login\""
256 child = pexpect.spawn(mycommand)
257 child.expect("CVS password:",mytimeout)
258 child.sendline(mypasswd)
259 child.expect(pexpect.EOF)
260
261 # Logged in - checking out
262 os.system("su ${ECVS_RUNAS} -c \"${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}\" &> /dev/null")
263EndOfFile
264########################### End of inline-python ##################################
265 else
266 debug-print "$FUNCNAME: using anonymous cvs login"
200 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update" 267 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
268 fi
201 269
270 # log out and restore ownership
271 su $ECVS_RUNAS -c "cvs logout" &> /dev/null
272 chown `whoami` "${T}/cvspass"
202} 273}
203 274
204cvs_src_unpack() { 275cvs_src_unpack() {
205 276
206 debug-print-function $FUNCNAME $* 277 debug-print-function $FUNCNAME $*
207 cvs_fetch || die "died running cvs_fetch" 278 cvs_fetch || die "died running cvs_fetch"
208 279
209 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 280 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
210 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 281 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
282
283 # probably redundant, but best to make sure
284 mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
211 285
212 if [ -n "$ECVS_SUBDIR" ]; then 286 if [ -n "$ECVS_SUBDIR" ]; then
213 mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR 287 if [ -n "$ECVS_LOCAL" ]; then
214 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/ 288 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/*" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
289 else
290 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
291 fi
215 else 292 else
216 if [ -n "$ECVS_LOCAL" ]; then 293 if [ -n "$ECVS_LOCAL" ]; then
217 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE 294 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/*" "$WORKDIR/$ECVS_MODULE"
218 else 295 else
219 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR 296 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
220 fi 297 fi
221 fi 298 fi
222 299
223 # if the directory is empty, remove it; empty directories cannot exist in cvs. 300 # 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. 301 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
225 # still create the empty directory in workdir though. 302 # still create the empty directory in workdir though.
226 if [ "`ls -A $DIR`" == "CVS" ]; then 303 if [ "`ls -A $DIR`" == "CVS" ]; then
227 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR" 304 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
228 rm -rf $DIR 305 rm -rf "$DIR"
229 fi 306 fi
230 307
231 # implement some of base_src_unpack's functionality; 308 # implement some of base_src_unpack's functionality;
232 # note however that base.eclass may not have been inherited! 309 # note however that base.eclass may not have been inherited!
233 if [ -n "$PATCHES" ]; then 310 if [ -n "$PATCHES" ]; then
234 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 311 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
235 cd $S 312 cd "$S"
236 for x in $PATCHES; do 313 for x in $PATCHES; do
237 debug-print "patching from $x" 314 debug-print "patching from $x"
238 patch -p0 < $x 315 patch -p0 < "$x"
239 done 316 done
240 # make sure we don't try to apply patches more than once, since 317 # 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 318 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
242 export PATCHES="" 319 export PATCHES=""
243 fi 320 fi
244 321
245} 322}
246 323
247EXPORT_FUNCTIONS src_unpack 324EXPORT_FUNCTIONS src_unpack
248
249

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

  ViewVC Help
Powered by ViewVC 1.1.20