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

Diff of /eclass/cvs.eclass

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

Revision 1.23 Revision 1.36
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 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.36 2003/04/19 11:52:50 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.23 2002/11/01 10:54:42 danarmak Exp $ 6#
5# This eclass provides the generic cvs fetching functions. 7# This eclass provides the generic cvs fetching functions.
8# to use from an ebuild, set the 'ebuild-configurable settings' below in your ebuild before inheriting.
9# then either leave the default src_unpack or extend over cvs_src_unpack.
10# if you find that you need to call the cvs_* functions directly, i'd be interested to hear about it.
6 11
7ECLASS=cvs 12ECLASS=cvs
8INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
9 14
10# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass 15# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass
16# cvs command to run. you can set fex. "cvs -t" for extensive debug information 21# 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 22# 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. 23# the ~/.cvsrc config file and to use maximum compression.
19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 24[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
20 25
21# cvs options given after the command (i.e. cvs update foo) 26# cvs options given after the cvs command (update or checkout)
22# don't remove -dP or things won't work 27# don't remove -dP from update or things won't work
28[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP"
23[ -z "$ECVS_CVS_OPTIONS" ] && ECVS_CVS_OPTIONS="-dP" 29[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
24 30
25# set this for the module/subdir to be fetched non-recursively 31# set this to some value for the module/subdir to be fetched non-recursively: ECVS_LOCAL
26#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
27 32
28# Where the cvs modules are stored/accessed 33# Where the cvs modules are stored/accessed
29[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src" 34[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
30 35
31# Name of cvs server, set to "offline" to disable fetching 36# Name of cvs server, set to "offline" to disable fetching
32# (i.e. to assume module is checked out already and don't update it). 37# (i.e. to assume module is checked out already and don't update it).
33# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other 38# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other
34# parts of the full CVSROOT (which looks like 39# parts of the full CVSROOT (which looks like
35# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 40# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
36# other settings 41# other settings
42# the special value 'offline' disables fetching, assumes sources are alread in ECVS_TOP_DIR
37[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 43[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
38 44
39# Anonymous cvs login? 45# Authentication method to use - possible values are "pserver" and "ext"
40# if 'yes' uses :pserver: with empty password, if 'no' uses :ext: with $ECVS_PASS, other values not allowed 46# WARNING ext is NOT supported! (never was, despite what earlier version of this file said)
41[ -z "$ECVS_ANON" ] && ECVS_ANON="yes" 47[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
48[ "$ECVS_AUTH" == ext ] && die "ERROR: ext auth not supported. If you want it, please contact danarmak@gentoo.org."
42 49
43# Username to use 50# Use su to run cvs as user
51# Currently b0rked and wouldn't work with portage userpriv anyway without special magic
52# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
53
54# Username to give to the server
44[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 55[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
45 56
46# Password to use if anonymous login is off 57# Password to use
47[ -z "$ECVS_PASS" ] && ECVS_PASS="" 58[ -z "$ECVS_PASS" ] && ECVS_PASS=""
48 59
49# Module to be fetched, must be set explicitly - 60# Module to be fetched, must be set when kde_src_unpack is called
50# I don't like the former ="$PN" default setting 61# can include several directory levels, ie foo/bar/baz
51[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue" 62#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
52 63
53# Branch/tag to use, default is HEAD 64# Branch/tag to use, default is HEAD
54# uncomment the following line to enable the reset-branch-to-HEAD behaviour 65# the following default _will_ reset your branch checkout to head if used
55[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD" 66#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
56 67
57# Subdirectory in module to be fetched, default is not defined = whole module 68# deprecated - do not use
58# DO NOT set default to "", if it's defined at all code will break! 69[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
59# don't uncomment following line!
60#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR=""
61 70
62# --- end ebuild-configurable settings --- 71# --- end ebuild-configurable settings ---
63 72
64# add cvs to deps 73# add cvs to deps
65DEPEND="$DEPEND dev-util/cvs dev-python/pexpect" 74# ssh is used for ext auth
75# sudo is used to run as a specified user
76DEPEND="$DEPEND dev-util/cvs app-admin/sudo"
77#[ "$ECVS_AUTH" == "ext" ] && DEPEND="$DEPEND net-misc/openssh"
66 78
67# since we now longer have src_fetch as a redefinable ebuild function, 79# calls cvs_contorl, is called from cvs_src_unpack
68# we are forced to call this function from cvs_src_unpack
69cvs_fetch() { 80cvs_fetch() {
81
82 debug-print-function $FUNCNAME $*
83
84 # parameters modifying other parameters that should be effective every time cvs_prep is called, and not
85 # just every time cvs.eclas is inherited
86 # 1. parameter for local (non-recursive) fetching
87 if [ -n "$ECVS_LOCAL" ]; then
88 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
89 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
90 fi
91 # 2. cvs auto-switches branches, we just have to pass the correct -rBRANCH option to it when updating.
92 # doing it this way we get multiple -rX options - harmless afaik
93 if [ -n "$ECVS_BRANCH" ]; then
94 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
95 ECVS_CO_OPTS="$ECVS_CO_OPTS -r$ECVS_BRANCH"
96 fi
97
98 # it's easiest to always be in "run-as mode", logic-wise
99 # or would be if sudo didn't ask for a password even when sudo'ing to `whoami`
100 if [ -z "$ECVS_RUNAS" ]; then
101 run=""
102 else
103 run="sudo -u $ECVS_RUNAS"
104 fi
105
106 # create the top dir if needed
107 if [ ! -d "$ECVS_TOP_DIR" ]; then
108 # note that the addwrite statements in this block are only there to allow creating ECVS_TOP_DIR;
109 # we've already allowed writing inside it
110 # this is because it's simpler than trying to find out the parent path of the directory, which
111 # would need to be the real path and not a symlink for things to work (so we can't just remove
112 # the last path element in the string)
113 debug-print "$FUNCNAME: checkout mode. creating cvs directory"
114 addwrite /foobar
115 addwrite /
116 $run mkdir -p "/$ECVS_TOP_DIR"
117 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
118 fi
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
125 # determine checkout or update mode
126 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
127 mode=checkout
128 else
129 mode=update
130 fi
131
132 # disable the sandbox for this dir
133 addwrite "$ECVS_TOP_DIR"
134
135 # chowning the directory and all contents
136 if [ -n "$ECVS_RUNAS" ]; then
137 $run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR"
138 fi
139
140 # our server string (aka CVSHOST), without the password so it can be put in Root
141 server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
142
143 # switch servers automagically if needed
144 if [ "$mode" == "update" ]; then
145 cd /$ECVS_TOP_DIR/$ECVS_MODULE
146 oldserver="`$run cat CVS/Root`"
147 if [ "$server" != "$oldserver" ]; then
148
149 einfo "Changing CVS server from $oldserver to $server:"
150 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $server:"
151
152 einfo "Searching for CVS dirs..."
153 cvsdirs="`$run find . -iname CVS -print`"
154 debug-print "$FUNCNAME: CVS dirs found:"
155 debug-print "$cvsdirs"
156
157 einfo "Modifying CVS dirs..."
158 for x in $cvsdirs; do
159 debug-print "In $x"
160 $run echo "$server" > "$x/Root"
161 done
162
163 fi
164 fi
165
166 # the server string with the password in it
167 # needed for mode=update too as we may not be inside ECVS_MODULE but only inside ECVS_TOP_DIR
168 # however putting the password in in update mode can break (?)
169 if [ "$mode" == "checkout" ]; then
170 export CVSROOT=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
171 else
172 export CVSROOT=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
173 fi
174
175 # prepare a cvspass file just for this session, we don't want to mess with ~/.cvspass
176 touch "${T}/cvspass"
177 export CVS_PASSFILE="${T}/cvspass"
178 if [ -n "$ECVS_RUNAS" ]; then
179 chown "$ECVS_RUNAS" "${T}/cvspass"
180 fi
181
182 # commands to run
183 cmdupdate="${run} ${ECVS_CVS_COMMAND} update ${ECVS_UP_OPTS} ${ECVS_MODULE}"
184 cmdcheckout="${run} ${ECVS_CVS_COMMAND} checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
185
186 cd "${ECVS_TOP_DIR}"
187 if [ "${ECVS_AUTH}" == "pserver" ]; then
188 if [ "${mode}" == "update" ]; then
189 $cmdupdate
190 elif [ "${mode}" == "checkout" ]; then
191 $cmdcheckout
192 fi
193# elif [ "${ECVS_AUTH}" == "ext" ]; then
194# # for ext there's also a possible ssh prompt, code not yet written
195# echo "${ECVS_DELAY} continue connecting&yes" >> "$instruct"
196# echo "${ECVS_DELAY} CVS password:&${ECVS_PASS}" >> "$instruct"
197# if [ "$mode" == "update" ]; then
198# expect "$cvsout" "$instruct" | $cmdupdate > "$cvsout"
199# elif [ "$mode" == "checkout" ]; then
200# expect "$cvsout" "$instruct" | $cmdcheckout > "$cvsout"
201# fi
202 fi
203
204 # restore ownership. not sure why this is needed, but someone added it in the orig ECVS_RUNAS stuff.
205 if [ -n "$ECVS_RUNAS" ]; then
206 chown `whoami` "${T}/cvspass"
207 fi
208
209}
210
211
212cvs_src_unpack() {
70 213
71 debug-print-function $FUNCNAME $* 214 debug-print-function $FUNCNAME $*
72 215
73 debug-print "$FUNCNAME: init: 216 debug-print "$FUNCNAME: init:
74ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 217ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
218ECVS_UP_OPTS=$ECVS_UP_OPTS
75ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 219ECVS_CO_OPTS=$ECVS_CO_OPTS
76ECVS_TOP_DIR=$ECVS_TOP_DIR 220ECVS_TOP_DIR=$ECVS_TOP_DIR
77ECVS_SERVER=$ECVS_SERVER 221ECVS_SERVER=$ECVS_SERVER
78ECVS_ANON=$ECVS_ANON
79ECVS_USER=$ECVS_USER 222ECVS_USER=$ECVS_USER
80ECVS_PASS=$ECVS_PASS 223ECVS_PASS=$ECVS_PASS
81ECS_MODULE=$ECVS_MODULE 224ECS_MODULE=$ECVS_MODULE
82ECVS_SUBDIR=$ECVS_SUBDIR
83ECVS_LOCAL=$ECVS_LOCAL 225ECVS_LOCAL=$ECVS_LOCAL
84DIR=$DIR" 226ECVS_RUNAS=$ECVS_RUNAS"
85 227
86 # a shorthand 228 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
87 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
88 debug-print "$FUNCNAME: now DIR=$DIR"
89 229
90 if [ "$ECVS_SERVER" == "offline" ]; then 230 if [ "$ECVS_SERVER" == "offline" ]; then
91 # we're not required to fetch anything, the module already exists and shouldn't be updated 231 # we're not required to fetch anything, the module already exists and shouldn't be updated
92 if [ -d "$DIR" ]; then 232 if [ -d "${ECVS_TOP_DIR}/${ECVS_MODULE}" ]; then
93 debug-print "$FUNCNAME: offline mode, exiting" 233 debug-print "$FUNCNAME: offline mode, exiting"
94 return 0 234 return 0
95 else 235 else
96 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting."
97 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error" 236 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
98 return 1 237 die "ERROR: Offline mode specified, but module/subdir checkout not found. Aborting."
99 fi 238 fi
100 fi 239 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
101 240 einfo "Fetching cvs module $ECVS_MODULE into $ECVS_TOP_DIR..."
102 # create target directory as needed 241 cvs_fetch
103 if [ ! -d "$DIR" ]; then 242 else # ECVS_SERVER not set
104 debug-print "$FUNCNAME: creating cvs directory $DIR" 243 die "ERROR: CVS server not set, cannot continue."
105 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
106 addwrite /foobar
107 addwrite /
108 mkdir -p /$DIR
109 export SANDBOX_WRITE=${SANDBOX_WRITE//:\/foobar:\/}
110 fi
111
112 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
113 # otherwise addwrite() doesn't work.
114 cd -P $ECVS_TOP_DIR > /dev/null
115 ECVS_TOP_DIR="`/bin/pwd`"
116 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
117 cd $OLDPWD
118
119 debug-print "$FUNCNAME: now DIR=$DIR"
120
121 # disable the sandbox for this dir
122 # not just $DIR because we want to create moduletopdir/CVS too
123 addwrite $ECVS_TOP_DIR/$ECVS_MODULE
124
125 # add option for local (non-recursive) fetching
126 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
127
128 # prepare a cvspass file just for this session so that cvs thinks we're logged
129 # in at the cvs server. we don't want to mess with ~/.cvspass.
130 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass
131 export CVS_PASSFILE="${T}/cvspass"
132 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
133
134 # Note: cvs update and checkout commands are unified.
135 # we make sure a CVS/ dir exists in our module subdir with the right
136 # Root and Repository entries in it and cvs update.
137
138 [ "${ECVS_ANON}" == "yes" ] && \
139 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
140 newserver=":ext:${ECVS_USER}@${ECVS_SERVER}"
141
142
143 # CVS/Repository files can't (I think) contain two concatenated slashes
144 if [ -n "$ECVS_SUBDIR" ]; then
145 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
146 else
147 repository="${ECVS_MODULE}"
148 fi
149
150 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
151 debug-print "$FUNCNAME: entering directory $DIR"
152 cd /$DIR
153
154 if [ ! -d "CVS" ]; then
155 # create a new CVS/ directory (checkout)
156 debug-print "$FUNCNAME: creating new cvs directory"
157
158 mkdir CVS
159 echo $newserver > CVS/Root
160 echo $repository > CVS/Repository
161 touch CVS/Entries
162
163 # if we're checking out a subdirectory only, create a CVS/ dir
164 # in the module's top dir so that the user (and we) can cvs update
165 # from there to get the full module.
166 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
167 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
168 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/
169 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository
170 fi 244 fi
171
172 else
173 #update existing module
174 debug-print "$FUNCNAME: updating existing module/subdir"
175
176 # Switch servers if needed
177 # cvs keeps the server info in the CVS/Root file in every checked-out dir;
178 # we can fix those files to point to the new server
179 oldserver="`cat CVS/Root`"
180 if [ "$newserver" != "$oldserver" ]; then
181 245
182 einfo "Changing CVS server from $oldserver to $newserver:"
183 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:"
184
185 einfo "Searching for CVS dirs..."
186 cvsdirs="`find . -iname CVS -print`"
187 debug-print "$FUNCNAME: CVS dirs found:"
188 debug-print "$cvsdirs"
189
190 einfo "Modifying CVS dirs..."
191 for x in $cvsdirs; do
192 debug-print "In $x"
193 echo $newserver > $x/Root
194 done
195
196 fi
197
198 fi
199
200 # cvs auto-switches branches, how nice
201 # warning: if we do it this way we get multiple -rX options - harmless i think
202 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH"
203
204 # finally run the cvs update command
205 debug-print "$FUNCNAME: is in dir `/bin/pwd`"
206 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR"
207 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..."
208
209 if [ "${ECVS_ANON}" == "no" ]; then
210
211 debug-print "$FUNCNAME: starting non-anonymous cvs login..."
212 # CVS Login - written in python :: the right way ;)
213 # Tilman Klar, <phoenix@gentoo.org>
214
215 export CVS_RSH="/usr/bin/ssh"
216
217############################## inline-python #####################################
218/usr/bin/env python << EndOfFile
219
220import pexpect,os
221
222mypasswd = "${ECVS_PASS}"
223mytimeout = 10
224
225mycommand = "${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}"
226child = pexpect.spawn(mycommand)
227
228index = child.expect(['continue connecting','word:'], mytimeout)
229if index == 0:
230 child.sendline('yes')
231 ## Added server to ~/.ssh/known_hosts
232 child.expect('word:', mytimeout)
233else:
234 ## Server already is in ~/.ssh/known_hosts
235 pass
236
237child.sendline(mypasswd)
238child.expect(pexpect.EOF)
239
240EndOfFile
241########################### End of inline-python ##################################
242 else
243 debug-print "$FUNCNAME: using anonymous cvs login"
244 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
245 fi
246
247
248
249}
250
251cvs_src_unpack() {
252
253 debug-print-function $FUNCNAME $*
254 cvs_fetch || die "died running cvs_fetch"
255
256 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..." 246 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR..."
257 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..." 247 debug-print "Copying module $ECVS_MODULElocal_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
258 248
259 # probably redundant, but best to make sure 249 # probably redundant, but best to make sure
260 mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR 250 mkdir -p "$WORKDIR/$ECVS_MODULE"
261 251
262 if [ -n "$ECVS_SUBDIR" ]; then
263 if [ -n "$ECVS_LOCAL" ]; then 252 if [ -n "$ECVS_LOCAL" ]; then
264 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR 253 mkdir -p "$WORKDIR/$ECVS_MODULE"
265 else
266 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/..
267 fi
268 else
269 if [ -n "$ECVS_LOCAL" ]; then
270 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE 254 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE"/* "$WORKDIR/$ECVS_MODULE"
271 else 255 else
272 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR 256 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR/$ECVS_MODULE/.."
273 fi 257 fi
274 fi 258
275
276 # if the directory is empty, remove it; empty directories cannot exist in cvs. 259 # if the directory is empty, remove it; empty directories cannot exist in cvs.
277 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist. 260 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
278 # still create the empty directory in workdir though. 261 # still create the empty directory in workdir though.
279 if [ "`ls -A $DIR`" == "CVS" ]; then 262 if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_MODULE}\"`" == "CVS" ]; then
280 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR" 263 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE"
281 rm -rf $DIR 264 rm -rf "${ECVS_TOP_DIR}/${ECVS_MODULE}"
282 fi 265 fi
283 266
284 # implement some of base_src_unpack's functionality; 267 # implement some of base_src_unpack's functionality;
285 # note however that base.eclass may not have been inherited! 268 # note however that base.eclass may not have been inherited!
286 if [ -n "$PATCHES" ]; then 269 if [ -n "$PATCHES" ]; then
287 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 270 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
288 cd $S 271 cd "$S"
289 for x in $PATCHES; do 272 for x in $PATCHES; do
290 debug-print "patching from $x" 273 debug-print "patching from $x"
291 patch -p0 < $x 274 patch -p0 < "$x"
292 done 275 done
293 # make sure we don't try to apply patches more than once, since 276 # make sure we don't try to apply patches more than once, since
294 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack 277 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
295 export PATCHES="" 278 export PATCHES=""
296 fi 279 fi

Legend:
Removed from v.1.23  
changed lines
  Added in v.1.36

  ViewVC Help
Powered by ViewVC 1.1.20